Commit d101e877 authored by Glenn Morris's avatar Glenn Morris

; Fix stray merge conflict

parent bd5ca559
Pipeline #1865 failed with stage
in 4 seconds
......@@ -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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment