# Conflicts: # Assets/Effect.meta # BuildABs/Android/files.unity3d # BuildABs/Android/lzma/luabytes.unity3d # BuildABs/Android/lzma/resconfigs.unity3d # ProjectSettings/ProjectSettings.asset |
||
|---|---|---|
| .. | ||
| Android | ||
# Conflicts: # Assets/Effect.meta # BuildABs/Android/files.unity3d # BuildABs/Android/lzma/luabytes.unity3d # BuildABs/Android/lzma/resconfigs.unity3d # ProjectSettings/ProjectSettings.asset |
||
|---|---|---|
| .. | ||
| Android | ||