diff options
Diffstat (limited to 'spec/lib/gitlab/git/conflict/file_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/git/conflict/file_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/lib/gitlab/git/conflict/file_spec.rb b/spec/lib/gitlab/git/conflict/file_spec.rb index afed6c32af6..a6cabd4966a 100644 --- a/spec/lib/gitlab/git/conflict/file_spec.rb +++ b/spec/lib/gitlab/git/conflict/file_spec.rb @@ -1,4 +1,3 @@ -# coding: utf-8 require 'spec_helper' describe Gitlab::Git::Conflict::File do |