merging w/master

src/bmi_topmodel.c

@@ -990,11 +990,7 @@ static int Set_value (Bmi *self, const char *name, void *array)
         // assign self->data to topmodel pointer
         topmodel = (topmodel_model *) self->data;
 
-<<<<<<< HEAD
-
 #if TOPMODEL_DEBUG >= 1
-=======
->>>>>>> origin/master
         printf("\n\n\nAT LEAST ONE OF THE FOLLOWING CALIBRATABLE PARAMETERS "
 			"WAS PROVIDED IN THE REALIZATION.JSON FILE!\n");
 
@@ -1012,11 +1008,7 @@ static int Set_value (Bmi *self, const char *name, void *array)
         printf("szm = %f\n", topmodel->szm); 
 	printf("sr0 = %f\n", topmodel->sr0);
         printf("t0 = %f\n\n\n\n", topmodel->t0);
-<<<<<<< HEAD
 #endif
-=======
->>>>>>> origin/master
-
     }
 
     // UPDATE APPROPRIATE PARAMETERS