diff options
Diffstat (limited to 'lib/gitlab/git/conflict/resolution.rb')
| -rw-r--r-- | lib/gitlab/git/conflict/resolution.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/gitlab/git/conflict/resolution.rb b/lib/gitlab/git/conflict/resolution.rb new file mode 100644 index 00000000000..ab9be683e15 --- /dev/null +++ b/lib/gitlab/git/conflict/resolution.rb @@ -0,0 +1,15 @@ +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 |