HCoop / clinton / Smoothieware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b0a0b75)
update firmware
authorJim Morris <morris@wolfman.com>
Mon, 27 Jun 2016 00:24:48 +0000 (17:24 -0700)
committerJim Morris <morris@wolfman.com>
Mon, 27 Jun 2016 00:24:48 +0000 (17:24 -0700)
FirmwareBin/firmware.bin patch | blob | blame | history
FirmwareBin/firmware.bin.md5sum patch | blob | blame | history

diff --git a/FirmwareBin/firmware.bin b/FirmwareBin/firmware.bin
dissimilarity index 64%
index 4a56741..02a0039 100755 (executable)
Binary files a/FirmwareBin/firmware.bin and b/FirmwareBin/firmware.bin differ
diff --git a/FirmwareBin/firmware.bin.md5sum b/FirmwareBin/firmware.bin.md5sum
index 630451a..0c7b112 100644 (file)
--- a/FirmwareBin/firmware.bin.md5sum
+++ b/FirmwareBin/firmware.bin.md5sum
@@ -1,5 +1 @@
-<<<<<<< HEAD
-61eb73a330a56139b9296d0b362195c2  FirmwareBin/firmware.bin
-=======
 ecf4dd3cc863ea6e857ef547e8902fa8  FirmwareBin/firmware.bin
->>>>>>> upstream/edge
Unnamed repository; edit this file 'description' to name the repository.