From 3fc39b029c6e2de2d801bb95873df81fa648daff Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 9 Nov 2014 22:22:22 -0800
Subject: [PATCH] Resolve conflict in emacs.d

---
 dotfiles/emacs.d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index fe9a06ee..1ddbea2c 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit fe9a06eebcc31f846251c4a11b04526ff0bd7e01
+Subproject commit 1ddbea2c1a1da55708822af67fbf3ce1379134e7