diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-06-01 14:00:43 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-06-01 14:00:43 -0700 |
| commit | d101e87715b10bea7c4f3700da266b8fb0290e55 (patch) | |
| tree | 32c39f5e2435c094a4c80a19d41c6a5ad48694f0 | |
| parent | bd5ca5597981949f0c8cac4e8844c7c56de15c51 (diff) | |
| download | emacs-d101e87715b10bea7c4f3700da266b8fb0290e55.tar.gz | |
; Fix stray merge conflict
| -rw-r--r-- | etc/HELLO | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/etc/HELLO b/etc/HELLO index 1c4381c3e27..33e664e8341 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -123,11 +123,6 @@ along with GNU Emacs. If not, see <<https://www.gnu.org/licenses/>. ;;; Local Variables: ;;; tab-width: 32 ;;; bidi-display-reordering: t -<<<<<<< HEAD ;;; coding: utf-8 -;;; End:</x-charset> -======= -;;; coding: iso-2022-7bit ;;; inhibit-compacting-font-caches: t -;;; End: ->>>>>>> 008b263 +;;; End:</x-charset> |