904118851 6 months ago
parent
commit
c39f3f9c92
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,3 +1,4 @@
+<<<<<<< HEAD
 2025-02-12T16:20:24: 
 2025-02-12T16:20:24: > heiyan@1.0.0 start
 2025-02-12T16:20:24: > node tg_factory_main.js
@@ -7,3 +8,9 @@
 2025-02-12T16:22:08: > node tg_factory_main.js
 2025-02-12T16:22:08: 
 2025-02-12T16:22:11: Connected to Redis
+=======
+2025-02-12T16:20:12: 
+2025-02-12T16:20:12: > heiyan@1.0.0 start
+2025-02-12T16:20:12: > node tg_factory_main.js
+2025-02-12T16:20:12: 
+>>>>>>> 26855451fce82442b1677946e1316048f1d9ad13

+ 7 - 0
logs/out.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-02-12T16:20:24: 
 2025-02-12T16:20:24: > heiyan@1.0.0 start
 2025-02-12T16:20:24: > node tg_factory_main.js
@@ -7,3 +8,9 @@
 2025-02-12T16:22:08: > node tg_factory_main.js
 2025-02-12T16:22:08: 
 2025-02-12T16:22:11: Connected to Redis
+=======
+2025-02-12T16:20:12: 
+2025-02-12T16:20:12: > heiyan@1.0.0 start
+2025-02-12T16:20:12: > node tg_factory_main.js
+2025-02-12T16:20:12: 
+>>>>>>> 26855451fce82442b1677946e1316048f1d9ad13