message no. 131585
Posted by wastrel in #github at 2016-04-15T14:30:26Z
i have a merge conflict and it is hateful to me and i want to get rid of it but i don't understand what the instructions are doing
Posted by wastrel in #github at 2016-04-15T14:30:26Z