Skip to content

Latest commit

 

History

History
5 lines (4 loc) · 89 Bytes

File metadata and controls

5 lines (4 loc) · 89 Bytes

MergeConflicts

Lets simulate some merge conflicts

Step 3

Changed to step 3 on master