mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Fixed conflicts after merge with master
This commit is contained in:
commit
3e902ecfbd
20 changed files with 445 additions and 114 deletions
|
@ -1079,6 +1079,7 @@ void Selection::paste_from_clipboard()
|
|||
case Instance:
|
||||
{
|
||||
paste_objects_from_clipboard();
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue