FACN3 / mashrou_ghazal

project autocomplet
http://tiny.cc/MashrouGhazal
Apache License 2.0
1 stars 0 forks source link

Incorrect merge? #39

Closed matthewdking closed 6 years ago

matthewdking commented 6 years ago

Not sure how this has got here but in the text file there is this from a merge at some point.

<<<<<<< HEAD

Make sure when you merge with master all conflicts are resolved and you have removed all of the things above.

Its on line 1 and also at the end of the file.