nv-kkudrynski 5 rokov pred
rodič
commit
8011a064b1
1 zmenil súbory, kde vykonal 0 pridanie a 6 odobranie
  1. 0 6
      README.md

+ 0 - 6
README.md

@@ -78,9 +78,3 @@ We're posting these examples on GitHub to better support the community, facilita
 
 ## Known issues
 In each of the network READMEs, we indicate any known issues and encourage the community to provide feedback.
-
-<<<<<<< HEAD
-=======
-
-
->>>>>>> gh/master