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>