Merge branch 'master' into build64-par/master

1 files changed, 3 insertions, 1 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 38f6e77..d102269 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -105,6 +105,7 @@
                        (set (make-local-variable 'tab-width) 2)
                        (set (make-local-variable 'indent-tabs-mode) nil)
                        )))
+  (:name go-mode :type elpa)
   (:name graphviz-dot-mode :type elpa)
   (:name haml-mode :type elpa)
   (:name markdown-mode :type elpa
@@ -112,7 +113,7 @@
   (:name nginx-mode :type elpa
    :after (put 'nginx-indent-level 'safe-local-variable 'integerp))
   (:name scss-mode :type elpa)
-  (:name go-mode :type elpa)
+  (:name yaml-mode :type elpa)
   ))
 ;; What packages el-get should install, both from above, and it's
 ;; internal list of sources.
@@ -138,6 +139,7 @@
     nginx-mode
     php-mode-improved
     scss-mode
+    yaml-mode
     )))