v0.2.54..v0.2.55 changeset NetworkMergerCreator.cpp

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.cpp
index bf6185d..58995c7 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "NetworkMergerCreator.h"
 
@@ -422,7 +422,7 @@ const NetworkMatch* NetworkMergerCreator::_getLargestContainer(const MatchSet& m
 }
 
 bool NetworkMergerCreator::isConflicting(const ConstOsmMapPtr& map, ConstMatchPtr m1,
-  ConstMatchPtr m2) const
+  ConstMatchPtr m2, const QHash<QString, ConstMatchPtr>& /*matches*/) const
 {
   bool result = false;
   if (dynamic_cast<const NetworkMatch*>(m1.get()) || dynamic_cast<const NetworkMatch*>(m2.get()))