From: Adam A.G. Shamblin <adam.shamblin@gmail.com>
Date: Sat, 23 May 2015 12:24:28 +0000 (-0600)
Subject: Fix merge conflicts.
X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=d3f9fd60aec919e4eaa51917d4deae4c48537a8c;p=dotfiles.git

Fix merge conflicts.
---

d3f9fd60aec919e4eaa51917d4deae4c48537a8c
diff --cc dotbash_profile
index da81429,0f4b3f9..709fd46
--- a/dotbash_profile
+++ b/dotbash_profile
@@@ -85,11 -86,8 +86,9 @@@ complete -F _envdir activat
  #
  ##################################################
  
- export JAVA_OPTS="-server -Xms512m -Xmx2048m -XX:+CMSClassUnloadingEnabled"
- 
 +export SCALA_HOME=/usr/local/bin/scala
  export PLAY_PATH="/usr/local/play"
- export PATH=$PATH:$SCALA_HOME:$PLAY_PATH
+ export PATH=$PATH:$PLAY_PATH
  
  ##################################################
  #