Browse Source

Merge branch 'master' of https://git.zipcode.rocks/chu1ta26/ZCW-PhoneBook

CHU1TA26 6 years ago
parent
commit
1778fc8120
1 changed files with 1 additions and 1 deletions
  1. 1
    1
      README.md

+ 1
- 1
README.md View File

@@ -1,6 +1,6 @@
1 1
 <<<<<<< HEAD
2 2
 # PhoneBook Lab:
3
-=======
3
+======= *
4 4
 # PhoneBook Lab
5 5
 >>>>>>> d733dda8f1c8fa4008665b34e3b9ea662b261d6d
6 6