Merge branch 'master' of github.com:whatevsz/dotfiles

Conflicts: README.rst
2013-10-01 21:25:07 +02:00
parent ae535f852c 5bf75402d1
commit 3d1dbb77e7
1 changed files with 1 additions and 0 deletions
--- a/README.rst
+++ b/README.rst
@@ -52,6 +52,7 @@ will be used.
 Required third party software
 -----------------------------

+<<<<<<< HEAD
 - ``zsh`` uses the configuration framework "oh-my-zsh", available at
  http://github.com/robbyrussell/oh-my-zsh