remove zsh trailer

seejohnrun · Dec 27, 2013 · 04d1f01 · 04d1f01
1 parent e38d783
commit 04d1f01
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.zshrc b/.zshrc
@@ -42,4 +42,3 @@ export JAVA_HOME=`/usr/libexec/java_home -v 1.7`
 
 # bind keys
 bindkey -e
->>>>>>> Stashed changes