[Dart-dev] DART/trunk Revision: 11213

[dart at ucar.edu]

thoar at ucar.edu
2017-03-07 10:51:31 -0700 (Tue, 07 Mar 2017)
77
A commit with nothing but comments to demonstrate how to resolve conflicts.




Modified: DART/trunk/models/clm/work/quickbuild.csh
===================================================================
--- DART/trunk/models/clm/work/quickbuild.csh	2017-03-07 17:40:03 UTC (rev 11212)
+++ DART/trunk/models/clm/work/quickbuild.csh	2017-03-07 17:51:31 UTC (rev 11213)
@@ -15,6 +15,11 @@
 # so this MUST be run first.
 #----------------------------------------------------------------------
 
+#----------------------------------------------------------------------
+#This is where I'm putting some gabage to make a conflict for svn 
+# resolution purposes.
+#----------------------------------------------------------------------
+
 \rm -f preprocess *.o *.mod
 \rm -f ../../../obs_def/obs_def_mod.f90
 \rm -f ../../../obs_kind/obs_kind_mod.f90