message no. 157848
Posted by diphtherial in #github at 2016-11-29T16:14:55Z
eh, i'll just leave it alone, but i've verified that pulling both branches does produce a trivial conflict
Posted by diphtherial in #github at 2016-11-29T16:14:55Z