# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1396985835 -10800
# Node ID 72f74fe407b16568173dd62336535af619eac81e
# Parent  3458d2911643b7e3e50ca9776df79f8d0a39d9d9# Parent  9d1bf84f379de69deba45d4ea68ff0e781a8b5b8
merged

diff -r 3458d2911643 -r 72f74fe407b1 .emacs-my
--- a/.emacs-my	Tue Apr 08 16:42:12 2014 +0300
+++ b/.emacs-my	Tue Apr 08 22:37:15 2014 +0300
@@ -2719,7 +2719,7 @@
           '(("jsp" . "\\.tagf?\\'")
             ("jsp" . "\\.jspf?\\'")))
   (add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode))
-  (add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.php\\'" . web-mode))
   (add-to-list 'auto-mode-alist '("\\.jspf?\\'" . web-mode))
   (add-to-list 'auto-mode-alist '("/WEB-INF/tags/.*\\.tagf?\\'" . web-mode))
   (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode))