gitlab-ce/lib/gitlab/conflict/resolution_error.rb

module Gitlab
  module Conflict
    class ResolutionError < StandardError
    end
  end
end