procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Fix stray merge conflict

Browse source
This commit is contained in:
Glenn Morris 2019-06-01 14:00:43 -07:00
parent bd5ca55979
commit d101e87715
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
etc/HELLO
View file

@ -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>