solved conflicts

MathCancer · Danariki99 · Nov 22, 2024 · Nov 22, 2024 · Nov 22, 2024 · Nov 29, 2024
commit b2f63f98e61623783a21383d95358978a7721620
diff --git a/Makefile b/Makefile
diff --git a/core/PhysiCell_utilities.h b/core/PhysiCell_utilities.h
@@ -121,6 +121,8 @@ void set_counter_normal_random(int value);
 
 void print_counters();
 
+void copy_file_to_output(std::string filename);
+
 };
 
 #endif
diff --git a/spheroid_TNF_model b/spheroid_TNF_model
diff --git a/start_and_stop_saving_files/bool_data.txt b/start_and_stop_saving_files/bool_data.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,6 +121,8 @@ void set_counter_normal_random(int value); @@
     void print_counters();
+    void copy_file_to_output(std::string filename);
     };
     #endif