v0.2.54..v0.2.55 changeset NetworkMatch.h

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMatch.h b/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMatch.h
index 87a8281..4049ebe 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMatch.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMatch.h
@@ -78,7 +78,9 @@ public:
   /**
    * Returns true if any of the elements in this are also in other's match pairs.
    */
-  virtual bool isConflicting(const ConstMatchPtr& other, const ConstOsmMapPtr& map) const override;
+  virtual bool isConflicting(
+    const ConstMatchPtr& other, const ConstOsmMapPtr& map,
+    const QHash<QString, ConstMatchPtr>& matches = QHash<QString, ConstMatchPtr>()) const override;
 
   /**
    * Returns true if either of the matched strings contains a non-whole edge.