From 083ece4c6d49527e5ad94161092d93d23ba6bb03 Mon Sep 17 00:00:00 2001
From: Tim McCarthy <thoomfish@gmail.com>
Date: Mon, 4 Jan 2016 13:44:47 -0800
Subject: [PATCH] Update dotspacemacs

- Add html layer
- Remove shell mode scroll margin fix obsoleted by Spacemacs 0.105
---
 spacemacs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/spacemacs b/spacemacs
index 627d63e..d21a2ef 100644
--- a/spacemacs
+++ b/spacemacs
@@ -27,6 +27,7 @@
           ruby
           php
           python
+          html
           ;; syntax-checking
           themes-megapack
           version-control
@@ -185,10 +186,6 @@ layers configuration."
         ad-do-it)))
 
   (evil-set-initial-state 'term-mode 'emacs)
-  (add-hook 'term-mode-hook
-            (lambda ()
-              (make-local-variable 'scroll-margin)
-              (setq scroll-margin 0)))
 
   (setq tab-width 2)
   (setq c-basic-offset 2)
@@ -216,6 +213,7 @@ layers configuration."
     ("614f8478963ec8caac8809931c9d00f670e4519388c02f71d9d27b66d5741a7f" default)))
  '(fci-rule-color "#37474f")
  '(hl-sexp-background-color "#1c1f26")
+ '(paradox-github-token t)
  '(python-indent-offset 2)
  '(ring-bell-function (quote ignore) t)
  '(shell-pop-autocd-to-working-dir nil)