Skip to content
Permalink
Browse files

Fix conflicts

  • Loading branch information
m-kuhn authored and nyalldawson committed Nov 19, 2020
1 parent 7161699 commit f340a339abc87b3302fc961c06f0f6302ed327f9
Showing with 0 additions and 4 deletions.
  1. +0 −4 src/providers/virtual/qgsvirtuallayersourceselect.cpp
@@ -218,9 +218,6 @@ void QgsVirtualLayerSourceSelect::testQuery()
std::unique_ptr<QgsVectorLayer> vl( new QgsVectorLayer( def.toString(), QStringLiteral( "test" ), QStringLiteral( "virtual" ), options ) );
if ( vl->isValid() )
{
<<<<<<< HEAD
QMessageBox::information( nullptr, tr( "Virtual layer test" ), tr( "No error" ) );
=======
const QStringList fieldNames = vl->fields().names();
if ( !mUIDField->text().isEmpty() && !vl->fields().names().contains( mUIDField->text() ) )
{
@@ -233,7 +230,6 @@ void QgsVirtualLayerSourceSelect::testQuery()
}
else
QMessageBox::information( nullptr, tr( "Test Virtual Layer" ), tr( "No error" ) );
>>>>>>> f3f052247b (Beautiful HTML)
}
else
{

0 comments on commit f340a33

Please sign in to comment.
You can’t perform that action at this time.