fix conflicts

open-mmlab · Sep 6, 2022 · 9874211 · 9874211
1 parent bbaa41b
commit 9874211
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/model-index.yml b/model-index.yml
@@ -30,8 +30,5 @@ Import:
   - configs/poolformer/metafile.yml
   - configs/csra/metafile.yml
   - configs/mvit/metafile.yml
-<<<<<<< HEAD
   - configs/efficientformer/metafile.yml
-=======
   - configs/mobileone/metafile.yml
->>>>>>> a02c9bb... update Readme and metafile