Compare commits
1 Commits
280626bf6b
...
feat/level
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cc82294cd9 |
@@ -1,19 +1,18 @@
|
|||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
<<<<<<<<< Temporary merge branch 1
|
"com.merry-yellow.code-assist": {
|
||||||
|
"version": "file:com.merry-yellow.code-assist",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "embedded",
|
||||||
|
"dependencies": {}
|
||||||
|
},
|
||||||
"com.autodesk.fbx": {
|
"com.autodesk.fbx": {
|
||||||
"version": "5.1.3",
|
"version": "5.1.3",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
=========
|
|
||||||
"com.merry-yellow.code-assist": {
|
|
||||||
"version": "file:com.merry-yellow.code-assist",
|
|
||||||
"depth": 0,
|
|
||||||
"source": "embedded",
|
|
||||||
"dependencies": {}
|
|
||||||
>>>>>>>>> Temporary merge branch 2
|
|
||||||
},
|
},
|
||||||
"com.unity.ai.navigation": {
|
"com.unity.ai.navigation": {
|
||||||
"version": "2.0.10",
|
"version": "2.0.10",
|
||||||
|
|||||||
Reference in New Issue
Block a user