summaryrefslogtreecommitdiff
path: root/lib/gitlab/conflict/parser.rb
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-09-15 11:55:57 -0300
committerFelipe Artur <felipefac@gmail.com>2017-09-15 14:45:21 -0300
commitb20595b2bd0023ebbc2ec46017f5d1cb1533fb4f (patch)
tree03157749ac0c980ab84d3ca9f659f36a01d55bfb /lib/gitlab/conflict/parser.rb
parent056c42cca5aa21fb2ebc9e5fc2cbedf18cf8dbbc (diff)
downloadgitlab-ce-b20595b2bd0023ebbc2ec46017f5d1cb1533fb4f.tar.gz
Add data migration
Diffstat (limited to 'lib/gitlab/conflict/parser.rb')
0 files changed, 0 insertions, 0 deletions