 (package-initialize)
 
 (defun package-install-with-refresh (package)
-<<<<<<< HEAD
   (unless (assq package package-alist)
     (package-refresh-contents))
   (unless (package-installed-p package)

  (menu-bar-mode 0))

(setq inhibit-startup-message t) ;; Don't display startup message
=======
(unless (assq package package-alist)
(package-refresh-contents))
(unless (package-installed-p package)
(package-install package)))

;; Initial window configuration
(when window-system
(split-window-horizontally)
(setq truncate-lines nil)
(setq truncate-partial-width-windows nil)

(setq default-frame-alist (append (list '(width .  164)
                                        '(height . 60))
                                  default-frame-alist)))

;; Don't display startup message
(setq inhibit-startup-message t)
>>>>>>> a89b798e19f773d59a9d9703c52b5574a1750e8e
;; (ansi-term "/bin/zsh")
(add-hook 'after-init-hook  (lambda() (eshell)))


			      (wdired-mode . normal))
      do (evil-set-initial-state mode state))

;; Other settings
(load-theme 'wombat)
(show-paren-mode t) ;; show parenthesis
