# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1396641953 -10800
# Node ID 9d1bf84f379de69deba45d4ea68ff0e781a8b5b8
# Parent  33ab3ce7f973a6f6c48d0618e2fa44309596950c# Parent  4aea0ddc3607677d317fbd5c538f164a09fac188
merged

diff -r 33ab3ce7f973 -r 9d1bf84f379d .emacs-my
--- a/.emacs-my	Thu Apr 03 14:09:53 2014 +0300
+++ b/.emacs-my	Fri Apr 04 23:05:53 2014 +0300
@@ -2720,7 +2720,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))