diff options
Diffstat (limited to 'lib/gitlab/conflict/resolution_error.rb')
| -rw-r--r-- | lib/gitlab/conflict/resolution_error.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/gitlab/conflict/resolution_error.rb b/lib/gitlab/conflict/resolution_error.rb deleted file mode 100644 index 0b61256b35a..00000000000 --- a/lib/gitlab/conflict/resolution_error.rb +++ /dev/null @@ -1,5 +0,0 @@ -module Gitlab - module Conflict - ResolutionError = Class.new(StandardError) - end -end |