Resolve merge conflict in Readme.txt on new_feature2
This commit is contained in:
@@ -1 +1,5 @@
|
|||||||
//edycja
|
<<<<<<< HEAD
|
||||||
|
//edycja
|
||||||
|
=======
|
||||||
|
//edycja 2
|
||||||
|
>>>>>>> 61d8f4f1af7e0671dbe044459f15a399c0d2afab
|
||||||
|
|||||||
Reference in New Issue
Block a user