[from now] 2014/08/12 11:06:10

diff --git a/Brewfile b/Brewfile
index ffaf979..c4c7f38 100644
--- a/Brewfile
+++ b/Brewfile
@@ -38,7 +38,7 @@ cask install appcleaner
 cask install ccleaner
 cask install cd-to
 cask install cyberduck
-cask install day-o
+#cask install day-o
 cask install iterm2
 cask install karabiner
 cask install onyx
[from now] 2014/08/12 11:06:34

diff --git a/Brewfile b/Brewfile
index c4c7f38..5030929 100644
--- a/Brewfile
+++ b/Brewfile
@@ -38,7 +38,10 @@ cask install appcleaner
 cask install ccleaner
 cask install cd-to
 cask install cyberduck
+<<<<<<< HEAD
 #cask install day-o
+=======
+>>>>>>> c903d028009fbfc1cbf8067afc96ec7f22b82865
 cask install iterm2
 cask install karabiner
 cask install onyx
@@ -53,3 +56,4 @@ cask install qlstephen

 # Remove outdated versions
 cleanup
+cask cleanup