123

logs/combined.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-02-13T11:47:12: 
 2025-02-13T11:47:12: > heiyan@1.0.0 start
 2025-02-13T11:47:12: > node tg_factory_main.js
@@ -18,3 +19,9 @@
 2025-02-13T12:05:39: > node tg_factory_main.js
 2025-02-13T12:05:39: 
 2025-02-13T12:05:42: Connected to Redis
+=======
+2025-02-12T18:37:09: 
+2025-02-12T18:37:09: > heiyan@1.0.0 start
+2025-02-12T18:37:09: > node tg_factory_main.js
+2025-02-12T18:37:09: 
+>>>>>>> 633e60eef850233e23db3eac126a2ab3da98d06c

logs/out.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-02-13T11:47:12: 
 2025-02-13T11:47:12: > heiyan@1.0.0 start
 2025-02-13T11:47:12: > node tg_factory_main.js
@@ -18,3 +19,9 @@
 2025-02-13T12:05:39: > node tg_factory_main.js
 2025-02-13T12:05:39: 
 2025-02-13T12:05:42: Connected to Redis
+=======
+2025-02-12T18:37:09: 
+2025-02-12T18:37:09: > heiyan@1.0.0 start
+2025-02-12T18:37:09: > node tg_factory_main.js
+2025-02-12T18:37:09: 
+>>>>>>> 633e60eef850233e23db3eac126a2ab3da98d06c