904118851 4 months ago
parent
commit
c216686b3b
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,5 +1,12 @@
+<<<<<<< HEAD
 2025-04-01T12:07:31: 
 2025-04-01T12:07:31: > heiyan@1.0.0 start
 2025-04-01T12:07:31: > node tg_factory_main.js
 2025-04-01T12:07:31: 
 2025-04-01T12:07:36: Connected to Redis
+=======
+2025-03-31T18:45:09: 
+2025-03-31T18:45:09: > heiyan@1.0.0 start
+2025-03-31T18:45:09: > node tg_factory_main.js
+2025-03-31T18:45:09: 
+>>>>>>> 6da56973c02dbd310b4a46ee7e9dc05ec52361fd

+ 7 - 0
logs/out.log

@@ -1,5 +1,12 @@
+<<<<<<< HEAD
 2025-04-01T12:07:31: 
 2025-04-01T12:07:31: > heiyan@1.0.0 start
 2025-04-01T12:07:31: > node tg_factory_main.js
 2025-04-01T12:07:31: 
 2025-04-01T12:07:36: Connected to Redis
+=======
+2025-03-31T18:45:09: 
+2025-03-31T18:45:09: > heiyan@1.0.0 start
+2025-03-31T18:45:09: > node tg_factory_main.js
+2025-03-31T18:45:09: 
+>>>>>>> 6da56973c02dbd310b4a46ee7e9dc05ec52361fd