deadlyvipers · paszczak3 · Jul 3, 2018 · Jul 3, 2018 · Jul 3, 2018 · Jul 4, 2018
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
+<<<<<<< HEAD
 Dojo Rules
 ==========
-
-This repository contains a list of dojo rules for the Deadly Vipers dojo
-
+read it
+=======
+it must to be read
+>>>>>>> inny
diff --git a/dojo_rules.md b/dojo_rules.md
@@ -1,8 +1,5 @@
 Dojo Rules
 ==========
-* Always be on time
 * Always take off your shoes
 * Keep the dojo tidy
 * Never bring live blades on the tatami
-* Respect your opponents
-* Most Sensei's should be respected
diff --git a/list.md b/list.md
@@ -0,0 +1,5 @@
+asdasdsad
+asdasdasd
+dasdas
+
+againd
diff --git a/nowe.md b/nowe.md
@@ -0,0 +1,3 @@
+
+nowy plik
+edycja