Fix merge conflics

This commit is contained in:
Jaime van Kessel 2022-02-17 15:07:48 +01:00
parent f682f56923
commit b5136ba70c
3 changed files with 1 additions and 11 deletions

View file

@ -32,9 +32,4 @@ Cura.Menu
onObjectAdded: menu.insertItem(index, object)
onObjectRemoved: menu.removeItem(object)
}
Cura.AskOpenAsProjectOrModelsDialog
{
id: askOpenAsProjectOrModelsDialog
}
}