904118851 7 months ago
parent
commit
86cd5d9093
2 changed files with 14 additions and 0 deletions
  1. 7 0
      logs/combined.log
  2. 7 0
      logs/out.log

+ 7 - 0
logs/combined.log

@@ -1,5 +1,12 @@
+<<<<<<< HEAD
 2025-01-24T12:39:43: 
 2025-01-24T12:39:43: > heiyan@1.0.0 start
 2025-01-24T12:39:43: > node tg_factory_main.js
 2025-01-24T12:39:43: 
 2025-01-24T12:39:46: Connected to Redis
+=======
+2025-01-20T17:27:42: 
+2025-01-20T17:27:42: > heiyan@1.0.0 start
+2025-01-20T17:27:42: > node tg_factory_main.js
+2025-01-20T17:27:42: 
+>>>>>>> 7af10d41e76b344855aa74f92c25850d75a88173

+ 7 - 0
logs/out.log

@@ -1,5 +1,12 @@
+<<<<<<< HEAD
 2025-01-24T12:39:43: 
 2025-01-24T12:39:43: > heiyan@1.0.0 start
 2025-01-24T12:39:43: > node tg_factory_main.js
 2025-01-24T12:39:43: 
 2025-01-24T12:39:46: Connected to Redis
+=======
+2025-01-20T17:27:42: 
+2025-01-20T17:27:42: > heiyan@1.0.0 start
+2025-01-20T17:27:42: > node tg_factory_main.js
+2025-01-20T17:27:42: 
+>>>>>>> 7af10d41e76b344855aa74f92c25850d75a88173