904118851 7 tháng trước cách đây
mục cha
commit
fc2a9cc13d
2 tập tin đã thay đổi với 14 bổ sung0 xóa
  1. 7 0
      logs/combined.log
  2. 7 0
      logs/out.log

+ 7 - 0
logs/combined.log

@@ -14,6 +14,7 @@
 2025-01-02T21:38:15: > node tg_factory_main.js
 2025-01-02T21:38:15: 
 >>>>>>> 58a557cc5df587d3b3b926d70c3e0eccf0d469b4
+<<<<<<< HEAD
 2025-01-09T15:34:18: 
 2025-01-09T15:34:18: > heiyan@1.0.0 start
 2025-01-09T15:34:18: > node tg_factory_main.js
@@ -29,3 +30,9 @@
 2025-01-09T15:42:50: > node tg_factory_main.js
 2025-01-09T15:42:50: 
 2025-01-09T15:42:53: Connected to Redis
+=======
+2025-01-09T14:46:43: 
+2025-01-09T14:46:43: > heiyan@1.0.0 start
+2025-01-09T14:46:43: > node tg_factory_main.js
+2025-01-09T14:46:43: 
+>>>>>>> b1c267102f4071b50bc2ee9af107e44f185e43dd

+ 7 - 0
logs/out.log

@@ -14,6 +14,7 @@
 2025-01-02T21:38:15: > node tg_factory_main.js
 2025-01-02T21:38:15: 
 >>>>>>> 58a557cc5df587d3b3b926d70c3e0eccf0d469b4
+<<<<<<< HEAD
 2025-01-09T15:34:18: 
 2025-01-09T15:34:18: > heiyan@1.0.0 start
 2025-01-09T15:34:18: > node tg_factory_main.js
@@ -29,3 +30,9 @@
 2025-01-09T15:42:50: > node tg_factory_main.js
 2025-01-09T15:42:50: 
 2025-01-09T15:42:53: Connected to Redis
+=======
+2025-01-09T14:46:43: 
+2025-01-09T14:46:43: > heiyan@1.0.0 start
+2025-01-09T14:46:43: > node tg_factory_main.js
+2025-01-09T14:46:43: 
+>>>>>>> b1c267102f4071b50bc2ee9af107e44f185e43dd