fixed merge problem

This commit is contained in:
Florens Wasserfall 2017-06-21 17:18:49 +02:00
parent c0dfffe0ff
commit 546bc0f4d0

View File

@ -2529,7 +2529,7 @@ sub object_menu {
wxTheApp->append_menu_item($menu, "Cut…", 'Open the 3D cutting tool', sub {
$self->object_cut_dialog;
}, undef, 'package.png');
$frame->_append_menu_item($menu, "Layer heights…", 'Open the dynamic layer height control', sub {
wxTheApp->append_menu_item($menu, "Layer heights…", 'Open the dynamic layer height control', sub {
$self->object_layers_dialog;
}, undef, 'cog.png');
$menu->AppendSeparator();