Changeset 3070

Timestamp:

02/22/10 11:57:53 (15 years ago)

Author:

Eric.Larour

Message:

fixed conflict

File:

• issm/trunk/etc/environment.csh (modified) (2 diffs)

issm/trunk/etc/environment.csh

@@ -2 +2 @@
 source $ISSM_DIR/etc/environment_variables.csh
 
-<<<<<<< .mine
-#MATLAB
-setenv MATLAB_DIR
-setenv PATH {$PATH}:{$MATLAB_DIR}/bin
-setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$MATLAB_DIR/lib
-=======
 #Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables 
 #to environment.
->>>>>>> .r3065
 
 #foreach i ($@)
@@ -25 +18 @@
 setenv MATLAB_DIR {$MATLAB_DIR}
 setenv PATH {$PATH}:{$MATLAB_DIR}/bin
+setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$MATLAB_DIR/lib
 
 #MPI