Another stray conflict marker

This commit is contained in:
Arjen Hiemstra 2016-07-13 14:33:42 +02:00
parent 36c185e921
commit f92f0c52c6

View File

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