From: Glenn Morris <rgm@gnu.org>
Date: Sat, 1 Jun 2019 21:00:43 +0000 (-0700)
Subject: ; Fix stray merge conflict
X-Git-Tag: emacs-27.0.90~2731
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d101e87715b10bea7c4f3700da266b8fb0290e55;p=emacs.git

; Fix stray merge conflict
---

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>