fix bad merge
This commit is contained in:
parent
0296c22845
commit
858c807856
1 changed files with 1 additions and 3 deletions
|
@ -35,9 +35,7 @@ int Project::default_map_size = 20;
|
||||||
int Project::max_object_events = 64;
|
int Project::max_object_events = 64;
|
||||||
|
|
||||||
Project::Project(QObject *parent) :
|
Project::Project(QObject *parent) :
|
||||||
QObject(parent),
|
QObject(parent)
|
||||||
eventScriptLabelModel(this),
|
|
||||||
eventScriptLabelCompleter(this)
|
|
||||||
{
|
{
|
||||||
initSignals();
|
initSignals();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue