message no. 117664
Posted by Mylon in #github at 2015-10-25T15:56:51Z
And trying to figure out what's going on keeps injecting lines into my code and creating conflicts and I have no idea why it's doing this. My code now contains, "<<<<< HEAD" and ">>>>> parent of ...."