123

logs/combined.log

@@ -1,4 +1,10 @@
 <<<<<<< HEAD
+2025-03-31T17:17:37: 
+2025-03-31T17:17:37: > heiyan@1.0.0 start
+2025-03-31T17:17:37: > node tg_factory_main.js
+2025-03-31T17:17:37: 
+=======
+<<<<<<< HEAD
 2025-03-30T13:34:46: 
 2025-03-30T13:34:46: > heiyan@1.0.0 start
 2025-03-30T13:34:46: > node tg_factory_main.js
@@ -23,3 +29,4 @@
 =======
 >>>>>>> 598ad81756fb6af3eb5e57791415f9a36f81b297
 >>>>>>> 422e26ceb7529f5711ca10c2c8456e1864f8d8f7
+>>>>>>> bd05a8ec537d4fcb1f73f52778c510b908b1526d

logs/out.log

@@ -1,4 +1,10 @@
 <<<<<<< HEAD
+2025-03-31T17:17:37: 
+2025-03-31T17:17:37: > heiyan@1.0.0 start
+2025-03-31T17:17:37: > node tg_factory_main.js
+2025-03-31T17:17:37: 
+=======
+<<<<<<< HEAD
 2025-03-30T13:34:46: 
 2025-03-30T13:34:46: > heiyan@1.0.0 start
 2025-03-30T13:34:46: > node tg_factory_main.js
@@ -23,3 +29,4 @@
 =======
 >>>>>>> 598ad81756fb6af3eb5e57791415f9a36f81b297
 >>>>>>> 422e26ceb7529f5711ca10c2c8456e1864f8d8f7
+>>>>>>> bd05a8ec537d4fcb1f73f52778c510b908b1526d