# Conflicts: # ProjectSettings/Packages/com.unity.probuilder/Settings.json
# Conflicts: # Assets/_Artist Tools Demo/Artist tools demo_Start.meta # Assets/_Artist Tools Demo/Materials/BoatShadergraph_Complete.mat # Assets/_Artist Tools Demo/Materials/BoatSkin.shadergraph # Assets/_Artist Tools Demo/Prefabs/_BoatPrototype.prefab # Assets/_Artist Tools Demo/Prefabs/_BoatPrototype.prefab.meta