diff options
| author | Joakim Verona <joakim@verona.se> | 2012-05-21 00:37:29 +0200 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2012-05-21 00:37:29 +0200 |
| commit | 74f082445c1dd0c92d5bb187db0d50287e3a7bae (patch) | |
| tree | 48e3d8fd9df3876665654eab9bcf96ec492a31e9 /lisp/language/utf-8-lang.el | |
| parent | 52862ad482e030e4d54cd7d6e250d76e59ee0554 (diff) | |
| parent | 1b170bc63c2f3a3fbe6ba6996d5a015e82634909 (diff) | |
| download | emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.tar.gz emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.tar.bz2 emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.zip | |
upstream, fix conflicts
Diffstat (limited to 'lisp/language/utf-8-lang.el')
| -rw-r--r-- | lisp/language/utf-8-lang.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/language/utf-8-lang.el b/lisp/language/utf-8-lang.el index eb0828694d4..e0313870323 100644 --- a/lisp/language/utf-8-lang.el +++ b/lisp/language/utf-8-lang.el @@ -1,6 +1,6 @@ -;;; utf-8-lang.el --- generic UTF-8 language environment -*- no-byte-compile: t -*- +;;; utf-8-lang.el --- generic UTF-8 language environment -;; Copyright (C) 2001-2012 Free Software Foundation, Inc. +;; Copyright (C) 2001-2012 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n |