gitlab-org--gitlab-foss/lib/gitlab/conflict/resolution_error.rb

module Gitlab
  module Conflict
    ResolutionError = Class.new(StandardError)
  end
end