mirror of
https://github.com/huderlem/porymap.git
synced 2026-08-28 03:25:30 -05:00
fix bad merge
This commit is contained in:
@@ -35,9 +35,7 @@ int Project::default_map_size = 20;
|
||||
int Project::max_object_events = 64;
|
||||
|
||||
Project::Project(QObject *parent) :
|
||||
QObject(parent),
|
||||
eventScriptLabelModel(this),
|
||||
eventScriptLabelCompleter(this)
|
||||
QObject(parent)
|
||||
{
|
||||
initSignals();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user