Revert "Merge remote-tracking branch 'origin/MK2' into MK2"

This reverts commit 776a0c71515b95032e473f152569a974de31623a.
This commit is contained in:
Unknown 2017-09-23 20:57:38 +01:00
parent 63f68f1e40
commit 8d0948159d
1 changed files with 0 additions and 3 deletions

View File

@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
# Hyperfine Bed Levelling for Prusa i3 MK2/MK2S
NOTE: None of the modifications are mine, PJR and JeffJordan have shared the modifications on the Prusa3d.com Forums (http://shop.prusa3d.com/forum/prusa-i3-kit-building-calibrating-first-print-main-f6/hyperfine-bed-leveling--t4330.html)
@ -8,7 +6,6 @@ This repo is so that you can pull the changes into your own MK2 firmware (if you
## CURRENTLY NO FILES HAVE BEEN CHANGED (except this readme!)
>>>>>>> parent of 90ca96b... Readme
# Original Prusa i3 MK2 Firmware
## General instructions