# Conflicts: # Assets/Art Assets/Textures/Chars/Moose Angel.meta # Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta # Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_1.png.meta # Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_2.png.meta # Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta # Assets/Art Assets/Textures/Chars/Moose Angel/monster_1.png.meta # Assets/Art Assets/Textures/Chars/Moose Angel/monster_2.png.meta # Assets/Art Assets/Textures/Environ/backdrop/clouds1.png.meta # Assets/Art Assets/Textures/Environ/backdrop/clouds2.png.meta # Assets/Art Assets/Textures/Environ/backdrop/clouds3.png.meta # Assets/Art Assets/Tiles/Environment/DarkCastle/Spike.asset # Assets/Art Assets/Tiles/Environment/DarkCastle/Spike.asset.meta # Assets/Art Assets/Tiles/Environment/Main Palette.prefab # Assets/Scenes/Level 1.unity # Assets/Scenes/WalljumpTest.unity