!2100 tmporary fix of metadef conflict

Merge pull request !2100 from yanghaoran/r1.6
3 years ago · ea67886b3b
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,5 +4,5 @@
 	branch = master
 [submodule "metadef"]
 	path = metadef
 	url = https://gitee.com/ascend/metadef.git
 	url = https://gitee.com/nicholas_yhr/metadef.git
 	branch = master
--- a/+ 1
+++ b/+ 1
@@ -1 +1 @@
 Subproject commit 238e5308bf0191ac4598984ad6de80fa4a0cff4d
 Subproject commit 7910e842254d0e4a0004fa73cd95b6f937cdd307