Update V4.2.5

33d74bc9 · MagoKimbra · 0e0b0074 · 33d74bc9
Commit 33d74bc9 authored Feb 05, 2016 by MagoKimbra
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

README.md README.md +1 -6

No files found.
--- a/README.md
+++ b/README.md
 <img align="right" src="Documentation/Logo/MarlinKimbra%20Logo%20GitHub.png" />
-<<<<<<< HEAD
-# MK 3D Printer Firmware
+# MK 3D Printer Firmware for Arduino
 ## Version 4.2.5 dev
-=======
-# MarlinKimbra 3D Printer Firmware
-## Version 4.2.4
->>>>>>> origin/master

 ### Special thanks
 * all Marlin8bit-developers.