904118851 7 ay önce
ebeveyn
işleme
e2a15eea3e
2 değiştirilmiş dosya ile 42 ekleme ve 0 silme
  1. 21 0
      logs/combined.log
  2. 21 0
      logs/out.log

+ 21 - 0
logs/combined.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-01-26T14:29:08: 
 2025-01-26T14:29:08: > heiyan@1.0.0 start
 2025-01-26T14:29:08: > node tg_factory_main.js
@@ -13,3 +14,23 @@
 2025-01-26T15:13:44: > node tg_factory_main.js
 2025-01-26T15:13:44: 
 2025-01-26T15:13:47: Connected to Redis
+=======
+2025-01-25T18:11:46: 
+2025-01-25T18:11:46: > heiyan@1.0.0 start
+2025-01-25T18:11:46: > node tg_factory_main.js
+2025-01-25T18:11:46: 
+2025-01-25T18:11:48: Connected to Redis
+2025-01-25T18:14:56: 
+2025-01-25T18:14:56: > heiyan@1.0.0 start
+2025-01-25T18:14:56: > node tg_factory_main.js
+2025-01-25T18:14:56: 
+2025-01-25T18:15:00: Connected to Redis
+2025-01-25T18:33:52: 
+2025-01-25T18:33:52: > heiyan@1.0.0 start
+2025-01-25T18:33:52: > node tg_factory_main.js
+2025-01-25T18:33:52: 
+2025-01-25T18:34:31: 
+2025-01-25T18:34:31: > heiyan@1.0.0 start
+2025-01-25T18:34:31: > node tg_factory_main.js
+2025-01-25T18:34:31: 
+>>>>>>> eedad8a10034f3a09540d328abcfa6fcb098ecdc

+ 21 - 0
logs/out.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-01-26T14:29:08: 
 2025-01-26T14:29:08: > heiyan@1.0.0 start
 2025-01-26T14:29:08: > node tg_factory_main.js
@@ -13,3 +14,23 @@
 2025-01-26T15:13:44: > node tg_factory_main.js
 2025-01-26T15:13:44: 
 2025-01-26T15:13:47: Connected to Redis
+=======
+2025-01-25T18:11:46: 
+2025-01-25T18:11:46: > heiyan@1.0.0 start
+2025-01-25T18:11:46: > node tg_factory_main.js
+2025-01-25T18:11:46: 
+2025-01-25T18:11:48: Connected to Redis
+2025-01-25T18:14:56: 
+2025-01-25T18:14:56: > heiyan@1.0.0 start
+2025-01-25T18:14:56: > node tg_factory_main.js
+2025-01-25T18:14:56: 
+2025-01-25T18:15:00: Connected to Redis
+2025-01-25T18:33:52: 
+2025-01-25T18:33:52: > heiyan@1.0.0 start
+2025-01-25T18:33:52: > node tg_factory_main.js
+2025-01-25T18:33:52: 
+2025-01-25T18:34:31: 
+2025-01-25T18:34:31: > heiyan@1.0.0 start
+2025-01-25T18:34:31: > node tg_factory_main.js
+2025-01-25T18:34:31: 
+>>>>>>> eedad8a10034f3a09540d328abcfa6fcb098ecdc