merge conflict

diff --cc bash_it.sh
Simple merge

diff --cc themes/bobby/bobby.theme.bash
index c8e3447,c8d6204..e719995
--- 1/themes/bobby/bobby.theme.bash
--- 2/themes/bobby/bobby.theme.bash
+++ b/themes/bobby/bobby.theme.bash
@@@ -1,6 -1,10 +1,12 @@@
  #!/bin/bash
 -PROMPT="\[${bold_blue}\]\[\$(scm_char)\]\[${green}\]\[\$(scm_prompt_info)\]\[${blue}\]\[\$(rvm_version_prompt)\] \[${orange}\]\h \[${reset_color}\]in \[${green}\]\w \[${reset_color}\]\[→ "
+ SCM_THEME_PROMPT_DIRTY=" ${red}✗"
+ SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
+ SCM_THEME_PROMPT_PREFIX=" |"
+ SCM_THEME_PROMPT_SUFFIX="${green}|"
+ 
- PROMPT="\[${bold_blue}\]\[\$(prompt_char)\]\[\$(git_prompt_info)\]\[${blue}\]\[\$(rvm_version_prompt) \]\[${orange}\]\h \[${reset_color}\]in \[${green}\]\w \[${reset_color}\]\[\n\[${bold_blue}\]→\[${reset_color}\] "
++
++PROMPT="\[${bold_blue}\]\[\$(scm_char)\]\[${green}\]\[\$(scm_prompt_info)\]\[${blue}\]\[\$(rvm_version_prompt)\] \[${orange}\]\h \[${reset_color}\]in \[${green}\]\w \[${reset_color}\]\[\n\[${green}\]→\[${reset_color}\] "
 +
  
  # git theming
  GIT_THEME_PROMPT_DIRTY=" ${red}✗"