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

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Karl Pietrowski <thopiekar@googlemail.com>2016-11-18 01:09:51 +0300
committerGitHub <noreply@github.com>2016-11-18 01:09:51 +0300
commit8c4932f83778cd15ea252752129468f9f447d4e0 (patch)
tree7ed720383c91e9383ff0b10e990ee45d5d620099 /README.md
parentdfd512b637027438ebfb7304ee99c7eb44929706 (diff)
Cleanup
Diffstat (limited to 'README.md')
-rw-r--r--README.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/README.md b/README.md
index 376bdd8547..9357e436ff 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
Cura
====