From a3d4eb5664537c2f95cffab787f2a1e719998340 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 22 Mar 2010 17:10:42 +0000
Subject: [PATCH] BUG: Resolved (my own) conflict.

---
 etc/settings.csh | 14 ++------------
 etc/settings.sh  | 10 ++--------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/etc/settings.csh b/etc/settings.csh
index f5d26abad8..5d2950662c 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -70,19 +70,9 @@ setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
 # add OpenFOAM scripts and wmake to the path
 setenv PATH ${WM_DIR}:${WM_PROJECT_DIR}/bin:${PATH}
 
-<<<<<<< HEAD
-_foamAddPath $FOAM_APPBIN
-_foamAddPath $FOAM_SITE_APPBIN
-_foamAddPath $FOAM_USER_APPBIN
- # Make sure to pick up dummy versions of external libraries last
-_foamAddLib  $FOAM_LIBBIN/dummy
-_foamAddLib  $FOAM_LIBBIN
-_foamAddLib  $FOAM_SITE_LIBBIN
-_foamAddLib  $FOAM_USER_LIBBIN
-=======
 _foamAddPath ${FOAM_USER_APPBIN}:${FOAM_SITE_APPBIN}:${FOAM_APPBIN}
-_foamAddLib  ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}
->>>>>>> 00e72ccabdc9912f14f889531e88f60a79c68dcb
+ # Make sure to pick up dummy versions of external libraries last
+_foamAddLib  ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}:${FOAM_LIBBIN}/dummy
 
 
 # Select compiler installation
diff --git a/etc/settings.sh b/etc/settings.sh
index 58e2f5a7ff..8aab7498a6 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -94,15 +94,9 @@ export FOAM_RUN=$WM_PROJECT_USER_DIR/run
 # add OpenFOAM scripts and wmake to the path
 export PATH=$WM_DIR:$WM_PROJECT_DIR/bin:$PATH
 
-<<<<<<< HEAD
-_foamAddPath $FOAM_APPBIN $FOAM_SITE_APPBIN $FOAM_USER_APPBIN
- # Make sure to pick up dummy versions of external libraries last
-_foamAddLib  $FOAM_LIBBIN/dummy
-_foamAddLib  $FOAM_LIBBIN $FOAM_SITE_LIBBIN $FOAM_USER_LIBBIN
-=======
 _foamAddPath $FOAM_USER_APPBIN:$FOAM_SITE_APPBIN:$FOAM_APPBIN
-_foamAddLib  $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN
->>>>>>> 00e72ccabdc9912f14f889531e88f60a79c68dcb
+ # Make sure to pick up dummy versions of external libraries last
+_foamAddLib  $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN:$FOAM_LIBBIN/dummy
 
 
 # Compiler settings