Commit 6a1a6d2d authored by Andreas Brandl's avatar Andreas Brandl

Fix ce-to-ee merge conflicts for migration.

parent 8c3df625
......@@ -79,11 +79,7 @@ describe DeleteInconsistentInternalIdRecords, :migration do
end
context 'for milestones (by group)' do
<<<<<<< HEAD
# milestones (by group) is a little different than most of the other models
=======
# milestones (by group) is a little different than all of the other models
>>>>>>> upstream/master
let!(:group1) { create(:group) }
let!(:group2) { create(:group) }
let!(:group3) { create(:group) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment