Index: /issm/trunk/etc/environment.csh
===================================================================
--- /issm/trunk/etc/environment.csh	(revision 3069)
+++ /issm/trunk/etc/environment.csh	(revision 3070)
@@ -2,13 +2,6 @@
 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,4 +18,5 @@
 setenv MATLAB_DIR {$MATLAB_DIR}
 setenv PATH {$PATH}:{$MATLAB_DIR}/bin
+setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$MATLAB_DIR/lib
 
 #MPI