3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-27 04:41:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Another stray conflict marker

Browse source
This commit is contained in:
Arjen Hiemstra 2016-07-13 14:33:42 +02:00
parent 36c185e921
commit f92f0c52c6
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/ChangeLogPlugin/ChangeLog.txt
View file

@ -68,7 +68,6 @@ A new, infill type that’s easily breakable, introduced specially for support.
*Support Roofs *Support Roofs
A new sub-feature to reduce scars the support leaves on overhangs. A new sub-feature to reduce scars the support leaves on overhangs.
>>>>>>> 24c8773... Update changelog with corrections done after release
*Support Towers *Support Towers
Specialized support for tiny overhang areas. Specialized support for tiny overhang areas.