# Conflicts: # Assets/Objects/environment/Cliffs/Env_DistantCards.fbx.meta # Assets/Objects/environment/Cliffs/Maps/BGcards_Albedo.png.meta # Assets/Objects/environment/Cliffs/Maps/BGcards_Normal.png.meta # Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat # Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat.meta # Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat # Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat.meta # Assets/Objects/environment/Trees/small_tree_A.fbx # Assets/Objects/environment/Trees/small_tree_A.fbx.meta # ProjectSettings/QualitySettings.asset
-re-organized files preparing for merge into demo branch