From 078c9e16895d18414aa828bf0c1e6c4661eac531 Mon Sep 17 00:00:00 2001
From: Locojay <locojay@dev.dev>
Date: Sun, 5 Jun 2011 20:48:10 -0400
Subject: [PATCH] alias fix

---
 custom/aliases.zsh | 7 -------
 zshrc              | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/custom/aliases.zsh b/custom/aliases.zsh
index 533695d99..30af0de8b 100644
--- a/custom/aliases.zsh
+++ b/custom/aliases.zsh
@@ -46,17 +46,10 @@ alias print-libpath='echo -e ${LD_LIBRARY_PATH//:/\\n}'
 alias lsbom='lsbom -f -l -s -pf'
 #alias t="$HOME/.local/bin/t --task-dir ~/.tasks --list todo.txt --delete-if-empty"
 
-<<<<<<< HEAD
 #alias v.='vim .'
 #alias v='vim ~/.vimrc'
 #alias VS='vim -S Session.vim'
-=======
-alias v.='vim .'
-alias v='vim ~/.vimrc'
-alias VS='vim -S Session.vim'
 
-alias z='vim -o ~/.zshenv ~/.oh-my-zsh/custom/aliases.zsh ~/.zshrc'
->>>>>>> ashleydev/master
 alias zs='source ~/.zshrc'
 
 
diff --git a/zshrc b/zshrc
index e8e934e7c..1bbbc8589 100644
--- a/zshrc
+++ b/zshrc
@@ -7,7 +7,7 @@ export ZSH=$HOME/.oh-my-zsh
 # time that oh-my-zsh is loaded.
 export ZSH_THEME="robbyrussell"
 export ZSH_THEME="nicoulaj"
-MODE_INDICATOR="%{$fg_bold[cyan]%}-- CMD MODE -- $R"
+#MODE_INDICATOR="%{$fg_bold[cyan]%}-- CMD MODE -- $R"
 # Set to this to use case-sensitive completion
 # export CASE_SENSITIVE="true"