Closed matthewdking closed 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.
Not sure how this has got here but in the text file there is this from a merge at some point.
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.