Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Crocker <dcrocker@eschertech.com>2014-07-15 18:19:32 +0400
committerDavid Crocker <dcrocker@eschertech.com>2014-07-15 18:19:32 +0400
commit0d73438c679b2440d4e6668e36d507efd09ea089 (patch)
tree22e51a0c5a573167999a4e7374b71d669f5158c3 /.gitignore
parent71037ee4cd7e9f0a9b25bcbe07ec0420f2ef34bd (diff)
Updated .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 0 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index ea7124b5..a4c54576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,5 @@
*.d
*.o
Release/*
-!Release/RepRapFirmware*.bin
*~
*orig
-<<<<<<< HEAD
-/Release
-=======
->>>>>>> duet
-