#This line creates the actual conflict! #Adding some conflicts to our README.MD #The conflict has been solved
This is a README.MD file that will be used to describe this repository on GitHub
This is an extra line of text added to the copy pf README.MD in the cloned repository
This is another line of text added to the original copy of README.MD in the original repository
This is a much improved introduction that includes a new list of items
- Item 1
- Item 2
- Item 3