904118851 8 月之前
父节点
当前提交
c4e80bc946
共有 2 个文件被更改,包括 22 次插入0 次删除
  1. 11 0
      logs/combined.log
  2. 11 0
      logs/out.log

+ 11 - 0
logs/combined.log

@@ -80,8 +80,19 @@
 2024-12-24T00:06:50: > node tg_factory_main.js
 2024-12-24T00:06:50: 
 >>>>>>> caa2caec819ec166afc0627b8ea92c74fe16f645
+<<<<<<< HEAD
 2024-12-24T18:44:49: 
 2024-12-24T18:44:49: > heiyan@1.0.0 start
 2024-12-24T18:44:49: > node tg_factory_main.js
 2024-12-24T18:44:49: 
 2024-12-24T18:44:50: Connected to Redis
+=======
+2024-12-24T10:27:30: 
+2024-12-24T10:27:30: > heiyan@1.0.0 start
+2024-12-24T10:27:30: > node tg_factory_main.js
+2024-12-24T10:27:30: 
+2024-12-24T18:44:25: 
+2024-12-24T18:44:25: > heiyan@1.0.0 start
+2024-12-24T18:44:25: > node tg_factory_main.js
+2024-12-24T18:44:25: 
+>>>>>>> 450cd326a5c0dd90a1d576b9e1fe29a1cf4ac466

+ 11 - 0
logs/out.log

@@ -80,8 +80,19 @@
 2024-12-24T00:06:50: > node tg_factory_main.js
 2024-12-24T00:06:50: 
 >>>>>>> caa2caec819ec166afc0627b8ea92c74fe16f645
+<<<<<<< HEAD
 2024-12-24T18:44:49: 
 2024-12-24T18:44:49: > heiyan@1.0.0 start
 2024-12-24T18:44:49: > node tg_factory_main.js
 2024-12-24T18:44:49: 
 2024-12-24T18:44:50: Connected to Redis
+=======
+2024-12-24T10:27:30: 
+2024-12-24T10:27:30: > heiyan@1.0.0 start
+2024-12-24T10:27:30: > node tg_factory_main.js
+2024-12-24T10:27:30: 
+2024-12-24T18:44:25: 
+2024-12-24T18:44:25: > heiyan@1.0.0 start
+2024-12-24T18:44:25: > node tg_factory_main.js
+2024-12-24T18:44:25: 
+>>>>>>> 450cd326a5c0dd90a1d576b9e1fe29a1cf4ac466