Update

2025-04-29 00:49:29 +08:00
parent 8063af7eca
commit 3a21df9255
1 changed files with 0 additions and 7 deletions
@@ -124,14 +124,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {

   #文件处理：meyo_node_File
   "LoadAndAdjustImage": "加载重置图像🐠meeeyo.com",
-<<<<<<< HEAD
   "GenericImageLoader": "全能加载图像🐠meeeyo.com",
-=======
-<<<<<<< HEAD
-   "GenericImageLoader": "全能加载图像🐠meeeyo.com",
-=======
->>>>>>> 79ed250c5d0d1f11fccbec9087431ff25fc1e810
->>>>>>> f14d0c29f81a549b32997f82e610ad71cdb4404c
   "ImageAdjuster": "重置图像🐠meeeyo.com",
   "CustomCrop": "裁剪图像🐠meeeyo.com",
   "SaveImagEX": "保存图像🐠meeeyo.com",