projects / libreplanet-static.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 46375fc) | patch
removed duplicate info from merge conflict
authorAndrew Engelbrecht <sudoman@ninthfloor.org>
Thu, 16 Mar 2017 20:57:51 +0000 (16:57 -0400)
committerAndrew Engelbrecht <sudoman@ninthfloor.org>
Thu, 16 Mar 2017 20:57:51 +0000 (16:57 -0400)
commite24aa01b8204fed931703db0f2b6f03662e2073f
treef9114386a75e156227091649671618f2a9feb2d1tree | snapshot (zip tar.gz)
parent46375fc90e79be762c80456188ebac8269f67209commit | diff
removed duplicate info from merge conflict

a "git diff --word-diff" showed no differences between the sections in
the right scenario, so i've removed one of the copies.
2017/js-labels/index.html diff | blob | blame | history