Merge branch 'master' of https://github.com/FunPythonEC/uPy-genpy

sasilva1998 · sasilva1998 · commit c7cb6d0b649e · 2020-03-31T12:54:19.000-05:00
diff --git a/README.md b/README.md
@@ -31,6 +31,4 @@ You could verify it has been created with the following:
 import os
 os.listdir('std_msgs')
 ```
-=======
-Here everything needed in order to generate the python files for message usage can be found.
->>>>>>> 73de94b4ea4c44f58ebda99e238657cef2698260
+
