# Conflicts: # UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab # UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab # UOP1_Project/Assets/Prefabs/Characters/SlimeCritter_Base.prefab
Updating my local repository
Update fork