diff options
Diffstat (limited to 'lib/gitlab/conflict/resolution_error.rb')
| -rw-r--r-- | lib/gitlab/conflict/resolution_error.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/conflict/resolution_error.rb b/lib/gitlab/conflict/resolution_error.rb index a0f2006bc24..0b61256b35a 100644 --- a/lib/gitlab/conflict/resolution_error.rb +++ b/lib/gitlab/conflict/resolution_error.rb @@ -1,6 +1,5 @@ module Gitlab module Conflict - class ResolutionError < StandardError - end + ResolutionError = Class.new(StandardError) end end |