diff options
Diffstat (limited to 'resources/profiles/Creality.idx')
| -rw-r--r-- | resources/profiles/Creality.idx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/resources/profiles/Creality.idx b/resources/profiles/Creality.idx index 909b2b92a..f8abfb40a 100644 --- a/resources/profiles/Creality.idx +++ b/resources/profiles/Creality.idx @@ -1,11 +1,8 @@ -<<<<<<< HEAD -======= min_slic3r_version = 2.4.0-rc 0.1.3 Ender-3 S1 improvements. 0.1.2 Added alpha Ender 3 S1 profiles. min_slic3r_version = 2.4.0-beta4 0.1.1 Added Ender 2 Pro ->>>>>>> master min_slic3r_version = 2.3.2-alpha0 0.1.0 Added Ender-7, Sermoon D1, CR-10 SMART min_slic3r_version = 2.3.1-beta |