module Gitlab
  module Conflict
    class ResolutionError < StandardError
    end
  end
end