Merge branch 'master' of http://10.30.3.198:3000/zhangyu/SXD_v20
This commit is contained in:
commit
b9cbf8a502
Binary file not shown.
|
|
@ -1,6 +1,10 @@
|
||||||
{
|
{
|
||||||
"FileVersion": 3,
|
"FileVersion": 3,
|
||||||
|
<<<<<<< HEAD
|
||||||
|
"EngineAssociation": "5.3",
|
||||||
|
=======
|
||||||
"EngineAssociation": "5.5",
|
"EngineAssociation": "5.5",
|
||||||
|
>>>>>>> 81b4a818e8005f6f2f7c9318c0c8eff35872e5b6
|
||||||
"Category": "",
|
"Category": "",
|
||||||
"Description": "",
|
"Description": "",
|
||||||
"Modules": [
|
"Modules": [
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue