Skip to content
Snippets Groups Projects
Commit b702fd9a authored by CoderiGenius's avatar CoderiGenius
Browse files

Merge commit 'd36f80cd' 

# Conflicts:
#	README.md
parents da92327e d36f80cd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 0 deletions
README.md
+ 7
− 0
View file @ b702fd9a
......@@ -4,7 +4,14 @@
new branch1
2
3
<<<<<<< HEAD
new branch5
1
- 2
- 3
=======
new branch4
3
- 4
- 5
>>>>>>> d36f80cda29c32f1cd9a7fdbdfb5e973ac414d99
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment