# Conflicts:
#	Assets/Plugins/Android.meta
#	Assets/Resources/commons.meta
#	Assets/scripts/common/mainGameView.cs