diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-06-01 12:04:43 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-06-01 12:04:43 -0700 |
| commit | 602866264917f0772ceab356e3206a139719d2c5 (patch) | |
| tree | b5ae4aa29442919364d93de63834997ce6696ec7 /etc/HELLO | |
| parent | 5fb3782e95d512ddb9a23e7d713de5980c7c4c2a (diff) | |
| parent | 008b263feeba8951a95bec93ec0a9e263cf230f7 (diff) | |
| download | emacs-602866264917f0772ceab356e3206a139719d2c5.tar.gz emacs-602866264917f0772ceab356e3206a139719d2c5.tar.bz2 emacs-602866264917f0772ceab356e3206a139719d2c5.zip | |
Merge from origin/emacs-26
008b263 (origin/emacs-26, emacs-26) * lisp/gnus/gnus.el: Mark autoloa...
daf32f1 Speed up redisplay of HELLO
d8a6d82 Improve documentation of 'safe-local-variable' property
# Conflicts:
# etc/HELLO
Diffstat (limited to 'etc/HELLO')
| -rw-r--r-- | etc/HELLO | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/etc/HELLO b/etc/HELLO index a56a73bc1d2..1c4381c3e27 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -123,5 +123,11 @@ 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 |