[nongnu] elpa/yaml-mode 236832c 068/124: Merge branch 'liangfu-master'

[ELPA Syncer]

branch: elpa/yaml-mode
commit 236832caab8924c40e8ff622a94887e797dae69d
Merge: c757396 1cff904
Author: Vasilij Schneidermann <v.schneidermann@gmail.com>
Commit: Vasilij Schneidermann <v.schneidermann@gmail.com>

    Merge branch 'liangfu-master'
---
 README       | 2 +-
 yaml-mode.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index f2d6437..f095d9e 100644
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ SYNOPSIS
     handle files ending in '.yml', add something like:
 
     (require 'yaml-mode)
-    (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
+    (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
 
     to your .emacs file.
 
diff --git a/yaml-mode.el b/yaml-mode.el
index 39c0e57..f941c86 100644
--- a/yaml-mode.el
+++ b/yaml-mode.el
@@ -41,7 +41,7 @@
 ;; handle files ending in '.yml', add something like:
 ;;
 ;;    (require 'yaml-mode)
-;;    (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
+;;    (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
 ;;
 ;; to your .emacs file.
 ;;