🧹

qgis · May 15, 2020 · 7839f24 · 7839f24
1 parent 9810cfe
commit 7839f24
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8969,12 +8969,8 @@ void QgisApp::modifyAttributesOfSelectedFeatures()
 
   QgsAttributeDialog *dialog = new QgsAttributeDialog( vl, &f, false, this, true, context );
   dialog->setMode( QgsAttributeEditorContext::MultiEditMode );
-<<<<<<< HEAD
-  dialog->exec();
-=======
   dialog->setAttribute( Qt::WA_DeleteOnClose );
   dialog->show();
->>>>>>> 752d0ad369... Allow map interactions when multiedit window is open
 }
 
 void QgisApp::mergeSelectedFeatures()