Merge branch 'fix_format' into 'master'

fix format See merge request !384

Merge branch 'fix_format' into 'master'
fix format See merge request !384
c474951f · XianxinMao · a8fa4238 · d8e50967 · c474951f
隐藏空白更改
内联并排

Showing with 1 addition and 4 deletion

projects/shaoshengsong/imports.yml projects/shaoshengsong/imports.yml +1 -4

未找到文件。
--- a/projects/shaoshengsong/imports.yml
+++ b/projects/shaoshengsong/imports.yml
@@ -33,7 +33,4 @@ group:
  - description: ''
    mirrorRelease: false
    name: YOLOv5-Tools
-    topic: ''
-  
-=======
->>>>>>> projects/shaoshengsong/imports.yml
+    topic: ''
\ No newline at end of file