123

logs/combined.log

@@ -1,5 +1,12 @@
+<<<<<<< HEAD
 2025-01-10T12:28:02: 
 2025-01-10T12:28:02: > heiyan@1.0.0 start
 2025-01-10T12:28:02: > node tg_factory_main.js
 2025-01-10T12:28:02: 
 2025-01-10T12:28:04: Connected to Redis
+=======
+2025-01-10T12:41:24: 
+2025-01-10T12:41:24: > heiyan@1.0.0 start
+2025-01-10T12:41:24: > node tg_factory_main.js
+2025-01-10T12:41:24: 
+>>>>>>> a3e53949a998745972ae5058c2ff7c8658c83554

logs/out.log

@@ -1,5 +1,12 @@
+<<<<<<< HEAD
 2025-01-10T12:28:02: 
 2025-01-10T12:28:02: > heiyan@1.0.0 start
 2025-01-10T12:28:02: > node tg_factory_main.js
 2025-01-10T12:28:02: 
 2025-01-10T12:28:04: Connected to Redis
+=======
+2025-01-10T12:41:24: 
+2025-01-10T12:41:24: > heiyan@1.0.0 start
+2025-01-10T12:41:24: > node tg_factory_main.js
+2025-01-10T12:41:24: 
+>>>>>>> a3e53949a998745972ae5058c2ff7c8658c83554