You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
6 lines
147 B
6 lines
147 B
<<<<<<< HEAD
|
|
m_EditorVersion: 5.1.3f1
|
|
=======
|
|
m_EditorVersion: 5.2.0f3
|
|
>>>>>>> c85d23b96e9c647da9374d868cbb9e8fe3c15aed
|
|
m_StandardAssetsVersion: 0
|