904118851 8 ماه پیش
والد
کامیت
03316ba7ed
2فایلهای تغییر یافته به همراه14 افزوده شده و 0 حذف شده
  1. 7 0
      logs/combined.log
  2. 7 0
      logs/out.log

+ 7 - 0
logs/combined.log

@@ -116,7 +116,14 @@
 2024-12-21T14:49:07: > heiyan@1.0.0 start
 2024-12-21T14:49:07: > node tg_factory_main.js
 2024-12-21T14:49:07: 
+<<<<<<< HEAD
 2024-12-21T14:50:53: 
 2024-12-21T14:50:53: > heiyan@1.0.0 start
 2024-12-21T14:50:53: > node tg_factory_main.js
 2024-12-21T14:50:53: 
+=======
+2024-12-21T14:59:30: 
+2024-12-21T14:59:30: > heiyan@1.0.0 start
+2024-12-21T14:59:30: > node tg_factory_main.js
+2024-12-21T14:59:30: 
+>>>>>>> 94326f54e6f7e35ac19a78f2cad4952bfdcc0810

+ 7 - 0
logs/out.log

@@ -116,7 +116,14 @@
 2024-12-21T14:49:07: > heiyan@1.0.0 start
 2024-12-21T14:49:07: > node tg_factory_main.js
 2024-12-21T14:49:07: 
+<<<<<<< HEAD
 2024-12-21T14:50:53: 
 2024-12-21T14:50:53: > heiyan@1.0.0 start
 2024-12-21T14:50:53: > node tg_factory_main.js
 2024-12-21T14:50:53: 
+=======
+2024-12-21T14:59:30: 
+2024-12-21T14:59:30: > heiyan@1.0.0 start
+2024-12-21T14:59:30: > node tg_factory_main.js
+2024-12-21T14:59:30: 
+>>>>>>> 94326f54e6f7e35ac19a78f2cad4952bfdcc0810