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

Added text from main branch

parent 846f9a6f
No related branches found
No related tags found
No related merge requests found
...@@ -15,3 +15,6 @@ I am now editing this vim file on Branch A, this is so that any changes won't af ...@@ -15,3 +15,6 @@ 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 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 We are ready to commit
Update: I am now making changes on the main branch again
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment