v0.2.54..v0.2.55 changeset MultiaryPoiMergerCreator.cpp

diff --git a/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerCreator.cpp b/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerCreator.cpp
index c414526..fe7433d 100644
--- a/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerCreator.cpp
+++ b/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerCreator.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "MultiaryPoiMergerCreator.h"
 
@@ -80,7 +80,7 @@ std::vector<CreatorDescription> MultiaryPoiMergerCreator::getAllCreators() const
 }
 
 bool MultiaryPoiMergerCreator::isConflicting(const ConstOsmMapPtr&, ConstMatchPtr,
-  ConstMatchPtr) const
+  ConstMatchPtr, const QHash<QString, ConstMatchPtr>&) const
 {
   // Any relevant matches that contain conflicts will be resolved during the clustering phase.
   return false;