hannes/dotfiles
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	README.rst
This commit is contained in:
Hannes Körber
2013-10-01 21:25:07 +02:00
parent ae535f852c 5bf75402d1
commit 3d1dbb77e7
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.rst
View File

@@ -52,6 +52,7 @@ will be used.
Required third party software Required third party software
----------------------------- -----------------------------
<<<<<<< HEAD
- ``zsh`` uses the configuration framework "oh-my-zsh", available at - ``zsh`` uses the configuration framework "oh-my-zsh", available at
http://github.com/robbyrussell/oh-my-zsh http://github.com/robbyrussell/oh-my-zsh