 (add-hook 'magit-log-mode-hook 'magit-keys)
 (add-hook 'magit-diff-mode-hook 'magit-keys)
 (add-hook 'magit-staged-section-mode-hook 'magit-keys)
+<<<<<<< HEAD
 ;; (add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
 ;; (add-hook 'python-mode-hook 'my/python-mode-hook)
+=======
+;;(add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
+(add-hook 'python-mode-hook 'my/python-mode-hook)
+>>>>>>> 467ab7c... Added smooth scrolling mode
 ;;-------------------------------HOOKS--------------
 
 ;;-------------------------------KeY-Maps--------------


;;-------------------------------------Server------------------
(require 'server)
;; Start a server if (server-running-p) does not return t (e.g. if it
;; returns nil or :other)
(or (eq (server-running-p) t)
    (server-start))
;;-------------------------------------Server------------------



(add-to-list 'load-path "~/.emacs.d/elpa/htmlize")
(require 'htmlize)

(require 'smooth-scrolling)

(add-to-list 'load-path "~/.emacs.d/elpa/aggressive-indent")
(require 'aggressive-indent)
