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