Skip to content
Snippets Groups Projects
Commit 76d1e967 authored by ao1g22's avatar ao1g22
Browse files

Added new text to README from branch_A

parent 846f9a6f
No related branches found
No related tags found
No related merge requests found
......@@ -15,3 +15,8 @@ I am now editing this vim file on Branch A, this is so that any changes won't af
Update: I have merged both files so edits from both branches are now here. I have also removed details such as the >>>head
We are ready to commit
Update:
I am making some new changes to test out my ability to resolve conflicts
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment