| commit | 32f82e0ca596ed9357d541044970d9133639dc75 | |
| author | Eric S. Raymond <esr@thyrsus.com> | |
| Thu, 9 Jan 2014 16:49:05 +0000 (9 11:49 -0500) | ||
| committer | Eric S. Raymond <esr@thyrsus.com> | |
| Thu, 9 Jan 2014 16:49:05 +0000 (9 11:49 -0500) | ||
| tree | e302ae87a12de6c772ae955a909fe230809e4f89 | treesnapshot (tar.gz zip) |
| parent | f29778b343bc352a550033ab3d3e19e5a3ba677a | commitdiff |
Remove stray conflicty markar that the VCS somehow ignored.
| lisp/ChangeLog | diffblobblamehistory |