Skip to content
Permalink
Browse files

Fix blacktoblock

  • Loading branch information
m-kuhn authored and nyalldawson committed Jul 12, 2020
1 parent 6250b6f commit 499c5d3414406f03fcea7e2852cf6e918d9882d0
Showing with 1 addition and 7 deletions.
  1. +1 −7 src/core/qgsvectorlayerjoininfo.cpp
@@ -89,19 +89,13 @@ QStringList QgsVectorLayerJoinInfo::joinFieldNamesSubset( const QgsVectorLayerJo
{
if ( info.joinLayer() )
{
<<<<<<< HEAD
if ( !info.joinFieldNamesBlackList().contains( f.name() )
&& f.name() != info.joinFieldName() )
fieldNames.append( f.name() );
=======
const QgsFields fields { info.joinLayer()->fields() };
for ( const QgsField &f : fields )
{
if ( !info.joinFieldNamesBlockList().contains( f.name() )
if ( !info.joinFieldNamesBlackList().contains( f.name() )
&& f.name() != info.joinFieldName() )
fieldNames.append( f.name() );
}
>>>>>>> 06fea4ffe4... Merge pull request #37744 from m-kuhn/fix_offline_editing_with_aux_storage
}
}
}

0 comments on commit 499c5d3

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