diff options
| author | Eric S. Raymond | 2014-01-09 11:49:05 -0500 |
|---|---|---|
| committer | Eric S. Raymond | 2014-01-09 11:49:05 -0500 |
| commit | 32f82e0ca596ed9357d541044970d9133639dc75 (patch) | |
| tree | e302ae87a12de6c772ae955a909fe230809e4f89 | |
| parent | f29778b343bc352a550033ab3d3e19e5a3ba677a (diff) | |
| download | emacs-32f82e0ca596ed9357d541044970d9133639dc75.tar.gz emacs-32f82e0ca596ed9357d541044970d9133639dc75.zip | |
Remove stray conflicty markar that the VCS somehow ignored.
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fa07f2ded55..35627f458bc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | <<<<<<< TREE | ||
| 2 | 2014-01-09 Eric S. Raymond <esr@thyrsus.com> | 1 | 2014-01-09 Eric S. Raymond <esr@thyrsus.com> |
| 3 | 2 | ||
| 4 | * vc/vc-git.el (vc-git-print-log): Add --follow option to command, | 3 | * vc/vc-git.el (vc-git-print-log): Add --follow option to command, |