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

Resolved conflict

parents def70b13 76d1e967
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 1 deletion
README
+ 4
− 1
View file @ ccf6c4de
...@@ -17,4 +17,7 @@ Update: I have merged both files so edits from both branches are now here. I hav ...@@ -17,4 +17,7 @@ Update: I have merged both files so edits from both branches are now here. I hav
We are ready to commit We are ready to commit
Update: I am now making changes on the main branch again Update: I am now making changes on the main branch again:
I am making some new changes to test out my ability to resolve conflicts
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment