 (require 'gist)
 (setq gist-view-gist t)
 
-
-<<<<<<< HEAD
-=======
 ;;; remove makefile tab
 (add-hook 'makefile-mode-hook
           (lambda ()
             (whitespace-cleanup-mode 0)
             (setq tab-width 8)))
 
-
-
->>>>>>> 8d915519110aa102cf3c8580b6815ae8d88ddc11
 ;; install nyan-mode
 (require-package 'nyan-mode)
 

(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)

;; don't generate backup file
;;(setq make-backup-files nil)

;; all backups goto ~/.backups instead in the current directory
(setq backup-directory-alist (quote (("." . "~/.saves"))))
(setq backup-by-copying t)

(provide 'init-local)
