Commit 2d9f2a47 authored by MagoKimbra's avatar MagoKimbra

Fix ReadMe

parent 8df0f708
......@@ -40,14 +40,8 @@ The current MarlinKimbra dev team consists of:
- MagoKimbra - Alberto Cotronei (https://github.com/MagoKimbra)
More features have been added by:
<<<<<<< HEAD
- simone97 (https://github.com/simone97)
-
=======
- simone97 (https://github.com/simone97)
-
>>>>>>> origin/master
## License
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment