Skip to content

Commit 700d1f5

Browse files
zedditzeddit
committed
merge b3
2 parents 9d0e7bb + c6dc4c4 commit 700d1f5

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

‎CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1+
<<<<<<< HEAD
12
4
3+
=======
4+
1
5+
2
6+
3
7+
>>>>>>> b3

0 commit comments

Comments
 (0)