Skip to content

Commit 9f0c742

Browse files
committed
Fix rebase issues
1 parent 9ab3d46 commit 9f0c742

3 files changed

Lines changed: 2 additions & 1 deletion

File tree

app/test/testmodels.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "valuerelationfeaturesmodel.h"
1616
#include "projectsmodel.h"
1717
#include "projectsproxymodel.h"
18+
#include "coreutils.h"
1819

1920
#include <QtTest/QtTest>
2021

app/variablesmanager.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include "variablesmanager.h"
1111

12+
#include "coreutils.h"
1213
#include "qgsexpressioncontextutils.h"
1314
#include "inputexpressionfunctions.h"
1415

core/merginapi.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,6 @@ void MerginApi::createProjectFinished()
13801380
{
13811381
emit notifyError( tr( "Couldn't create the project. Please try again later or contact support if the problem persists." ) );
13821382
emit projectCreationFailed();
1383-
emit networkErrorOccurred( serverMsg, QStringLiteral( "Mergin API error: createProject" ), httpCode, projectId );
13841383
}
13851384
}
13861385
r->deleteLater();

0 commit comments

Comments
 (0)