From d8e509672f7f867b4216189839de6be29258621e Mon Sep 17 00:00:00 2001
From: MaoXianxin <qq1044467857@gmail.com>
Date: Mon, 19 Jul 2021 14:52:38 +0800
Subject: [PATCH] fix format

---
 projects/shaoshengsong/imports.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/projects/shaoshengsong/imports.yml b/projects/shaoshengsong/imports.yml
index a6fe9e7a0..e9b7eba60 100644
--- 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
-- 
GitLab