123

logs/combined.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-02-05T15:06:49: 
 2025-02-05T15:06:49: > heiyan@1.0.0 start
 2025-02-05T15:06:49: > node tg_factory_main.js
@@ -45,3 +46,9 @@
 2025-02-08T17:56:19: > heiyan@1.0.0 start
 2025-02-08T17:56:19: > node tg_factory_main.js
 2025-02-08T17:56:19: 
+=======
+2025-02-06T20:20:35: 
+2025-02-06T20:20:35: > heiyan@1.0.0 start
+2025-02-06T20:20:35: > node tg_factory_main.js
+2025-02-06T20:20:35: 
+>>>>>>> ce9d17ad595ccb56df8d088d9a17c8090f749d7e

logs/out.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-02-05T15:06:49: 
 2025-02-05T15:06:49: > heiyan@1.0.0 start
 2025-02-05T15:06:49: > node tg_factory_main.js
@@ -45,3 +46,9 @@
 2025-02-08T17:56:19: > heiyan@1.0.0 start
 2025-02-08T17:56:19: > node tg_factory_main.js
 2025-02-08T17:56:19: 
+=======
+2025-02-06T20:20:35: 
+2025-02-06T20:20:35: > heiyan@1.0.0 start
+2025-02-06T20:20:35: > node tg_factory_main.js
+2025-02-06T20:20:35: 
+>>>>>>> ce9d17ad595ccb56df8d088d9a17c8090f749d7e