Delete ProjectSettings (Albert Vilalta's conflicted copy 2014-10-21).asset

Conflictiu