合并后处理冲突

This commit is contained in:
lishuo committed 2021-03-30 19:32:11 +08:00
1 parent 9a7830f46a
commit dad88828d2
44 files changed
+12 -5352

No files matched your search

-1
View File
@@ -6,7 +6,6 @@
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.2.3",
"com.unity.nuget.newtonsoft-json": "2.0.0",
"com.unity.test-framework": "1.1.22",
"com.unity.textmeshpro": "2.1.1",
"com.unity.timeline": "1.2.18",