Merge pull request #485 from bixuanzju/patch-1

web-mode is now compatible with minor modes

modules/prelude-web.el

@@ -49,8 +49,6 @@
 (eval-after-load 'web-mode
   '(progn
      (defun prelude-web-mode-defaults ()
-       ;; Disable whitespace-mode when using web-mode
-       (whitespace-mode -1)
        ;; Customizations
        (setq web-mode-markup-indent-offset 4)
        (setq web-mode-css-indent-offset 2)