sillyfalcon / purple-octopus

1 stars 0 forks source link

Solved until step 4 and step 5 #5

Closed Shaswathpatil closed 3 years ago

ankitthakur007 commented 3 years ago

Git is showing that there are conflicts in the file.

How to resolve the conflicts @me-nobody @sillyfalcon