[Emacs-diffs] master d101e87: ; Fix stray merge conflict

[Glenn Morris]

branch: master
commit d101e87715b10bea7c4f3700da266b8fb0290e55
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    ; Fix stray merge conflict
---
 etc/HELLO | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/etc/HELLO b/etc/HELLO
index 1c4381c..33e664e 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>