Update loadhistory.sql

Resolved conflict
sciserver · Mar 8, 2023 · 94001ee · 94001ee
2 parents c7eb038 + 5fb1efb
commit 94001ee
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/schema/csv/loadhistory.sql b/schema/csv/loadhistory.sql
@@ -1340,10 +1340,7 @@ INSERT History VALUES('spCosmology','2010-12-10','Ani','Deleted spMath* function
 GO
 
 ------------------------------------
-<<<<<<< HEAD
 PRINT '1330 lines inserted into History'
-=======
-PRINT '1329 lines inserted into History'
->>>>>>> 5fb1efb5e8815c5768f20f5dcad1616a5efe0d50
-------------------------------------
+
+
 GO