Note
Once the instructor has created the scenario for conflicts to happen and has asked you to go ahead with this task, do not sync your fork. Check the develop branch of your fork is 1 commit behind the develop branch of the original repo. Then just go ahead with the task below.
Task description
- Go to section 1 of the readme inside @oyenuga17 /command-line folder
- Change the text from "Watch this video" to "Just watch this video"
- Go to section 2 of the readme inside @oyenuga17 /command-line folder.
- Change "This resource tells you how to format content using github markdown and you can also click this to download github markdown cheat sheet in pdf." to a list instead. Use the list below.
- Merge the conflict (just as you have been taught)
- Add a comment in you pull request to let instructor know that your pull request is ready for review when you are done
Task description