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

+ 7 - 0
logs/combined.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-01-15T14:14:13: 
 2025-01-15T14:14:13: > heiyan@1.0.0 start
 2025-01-15T14:14:13: > node tg_factory_main.js
@@ -402,3 +403,9 @@
 2025-01-15T14:32:21:     code: 'ECONNRESET'
 2025-01-15T14:32:21:   }
 2025-01-15T14:32:21: }
+=======
+2025-01-14T22:58:38: 
+2025-01-14T22:58:38: > heiyan@1.0.0 start
+2025-01-14T22:58:38: > node tg_factory_main.js
+2025-01-14T22:58:38: 
+>>>>>>> c12cf6fe2f8680704228d1e0ad03fffd8edcd735

+ 7 - 0
logs/out.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-01-15T14:14:13: 
 2025-01-15T14:14:13: > heiyan@1.0.0 start
 2025-01-15T14:14:13: > node tg_factory_main.js
@@ -13,3 +14,9 @@
 2025-01-15T14:32:20: > node tg_factory_main.js
 2025-01-15T14:32:20: 
 2025-01-15T14:32:21: Connected to Redis
+=======
+2025-01-14T22:58:38: 
+2025-01-14T22:58:38: > heiyan@1.0.0 start
+2025-01-14T22:58:38: > node tg_factory_main.js
+2025-01-14T22:58:38: 
+>>>>>>> c12cf6fe2f8680704228d1e0ad03fffd8edcd735