bump emacs d for use-package refactor, tweaks to linux. use tango-dark for iterm.

2014-11-12 02:03:43 -08:00
parent 4ce2cb6136
commit ab826de4c6
5 changed files with 84 additions and 97 deletions
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -75,7 +75,9 @@
 	added = green
 	changed = yellow
 	untracked = red
+	
 [merge]
 	conflictstyle = diff3
+	
 [include]
 	path = ~/.gitconfig.custom