Merge branch master
This commit is contained in:
+1
-1
@@ -11,5 +11,5 @@ ok i can pull
|
|||||||
|
|
||||||
and what about conflicts ?
|
and what about conflicts ?
|
||||||
|
|
||||||
|
here is what would cause a conflict hehe.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user