Merge branch 'bender' of https://github.com/autermann/prezto into bender

* 'bender' of https://github.com/autermann/prezto: Conflicts: zshrc
autermann · Nov 15, 2013 · f81945e · f81945e
2 parents 0f27a8d + 8c63b22
commit f81945e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/zshrc b/zshrc
@@ -1,4 +1,4 @@
-#G
+#
 # Executes commands at the start of an interactive session.
 #
 # Authors: