change uproject
This commit is contained in:
parent
afcd87b147
commit
140ae669ff
|
@ -100,17 +100,8 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
"Name": "SteamVR",
|
|
||||||
"Enabled": true,
|
|
||||||
"SupportedTargetPlatforms": [
|
|
||||||
"Win64",
|
|
||||||
"Linux"
|
|
||||||
]
|
|
||||||
=======
|
|
||||||
"Name": "Text3D",
|
"Name": "Text3D",
|
||||||
"Enabled": true
|
"Enabled": true
|
||||||
>>>>>>> b2f728d9235a46ad62d5e7c7de21eb82ae37a1ca
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
Loading…
Reference in New Issue