 (projectile-global-mode)
 (setq projectile-indexing-method 'native)
 
-
-<<<<<<< HEAD
-=======
-
 ;;; install js2-refactor
 (require-package 'js2-refactor)
 (require 'js2-refactor)

;; install golden-ratio
(require-package 'golden-ratio)
(require 'golden-ratio)
(golden-ratio-mode 1)

(provide 'init-local)

(require 'gist)
(setq gist-view-gist t)

;;; remove makefile tab
(add-hook 'makefile-mode-hook
          (lambda ()
            (whitespace-cleanup-mode 0)
            (setq tab-width 8)))

;; install nyan-mode
(require-package 'nyan-mode)

