Resolving conflict in #1266 merge

This commit is contained in:
Robby Russell committed 2013-04-23 20:30:21 -07:00
commit a2c8db9eb3
2 files changed
+17 -2

No files matched your search

+3
View File
@@ -26,6 +26,9 @@ ZSH_THEME="robbyrussell"
# Uncomment following line if you want to disable autosetting terminal title.
# DISABLE_AUTO_TITLE="true"
# Uncomment following line if you want to disable command autocorrection
# DISABLE_CORRECTION="true"
# Uncomment following line if you want red dots to be displayed while waiting for completion
# COMPLETION_WAITING_DOTS="true"