Commits

Toby Davies committed 96fcaa6

fix merge

  • Participants
  • Parent commits d0b4143

Comments (0)

Files changed (1)

     export PYTHONPATH="$PYTHONPATH:"$(echo ~/pyproj/*/)
 fi
 
-<<<<<<< variant A
->>>>>>> variant B
 
 
 if [[ -d /var/www ]] ; then
     hash -d www="/var/www"
 fi
-####### Ancestor
-if [[ -d /var/www ]] ; then
-    hash -d www="/var/www"
-fi
-if [[ -d /var/www/test ]] ; then
-    hash -d test="/var/www/test"
-fi
-======= end
 
-<<<<<<< variant A
 export PATH="$PATH:$HOME/minizinc-1.5.1/bin"
 export MANPATH="$MANPATH:$HOME/minizinc-1.5.1/doc/man"
->>>>>>> variant B
-####### Ancestor
-if [[ -d /var/www/new ]] ; then
-    hash -d new="/var/www/new"
-fi
-======= end