HCoop / clinton / Smoothieware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47d14aa fdf89b3)
Merge remote-tracking branch 'upstream/edge' into upstream-master
authorJim Morris <morris@wolfman.com>
Mon, 27 Jun 2016 00:23:47 +0000 (17:23 -0700)
committerJim Morris <morris@wolfman.com>
Mon, 27 Jun 2016 00:23:47 +0000 (17:23 -0700)
Conflicts:
FirmwareBin/firmware.bin
FirmwareBin/firmware.bin.md5sum

1  2 
FirmwareBin/firmware.bin.md5sum patch | diff1 | diff2 | blob | history

diff --cc FirmwareBin/firmware.bin.md5sum
index 5a396ef,0c7b112..630451a
--- 1/FirmwareBin/firmware.bin.md5sum
--- 2/FirmwareBin/firmware.bin.md5sum
+++ b/FirmwareBin/firmware.bin.md5sum
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +61eb73a330a56139b9296d0b362195c2  FirmwareBin/firmware.bin
++=======
+ ecf4dd3cc863ea6e857ef547e8902fa8  FirmwareBin/firmware.bin
++>>>>>>> upstream/edge
Unnamed repository; edit this file 'description' to name the repository.