GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 04:16:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove stray git conflict markers

Browse Source
This commit is contained in:
Arjen Hiemstra 2016-07-13 14:31:20 +02:00
parent 3f1bd5b586
commit 36c185e921
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ChangeLogPlugin/ChangeLog.txt
View File

@ -39,10 +39,6 @@ Per-object settings allow you to override individual profile settings per object
*Line Width *Line Width
Line width settings added per feature: Global, Walls, Top/Bottom, Infill, Skirt, Support. Line width settings added per feature: Global, Walls, Top/Bottom, Infill, Skirt, Support.
<<<<<<< HEAD
* Conical Support
An experimental filament, cost-reduction feature, for support.
=======
*Pattern Settings *Pattern Settings
Pattern settings improved per feature: Top/Bottom, Infill, Support. Pattern settings improved per feature: Top/Bottom, Infill, Support.