2019-02-15 15:39:39 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
module Gitlab
|
|
|
|
|
module Git
|
|
|
|
|
module Conflict
|
|
|
|
|
class Resolution
|
|
|
|
|
attr_reader :user, :files, :commit_message
|
|
|
|
|
|
|
|
|
|
def initialize(user, files, commit_message)
|
|
|
|
|
@user = user
|
|
|
|
|
@files = files
|
|
|
|
|
@commit_message = commit_message
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
