maybe fix broken merge

diff --git a/src/nfagraph/ng_extparam.cpp b/src/nfagraph/ng_extparam.cpp
index 2b492f7325cd2fc96b046060bd1f2f67fe415f11..abfe367eab73548ff9b424f766a9998732ebc656 100644 (file)
--- a/src/nfagraph/ng_extparam.cpp
+++ b/src/nfagraph/ng_extparam.cpp
@@ -603,7 +603,7 @@ bool transformMinLengthToRepeat(NGHolder &g, ReportManager &rm) {
         predcs.clear();
         predcs.emplace_back(v);
     }
-    assert(!preds.empty());
+    assert(!predcs.empty());
     for (auto u : predcs) {
         add_edge(u, cyclic, g);
     }

diff --git a/src/rose/rose_build_merge.cpp b/src/rose/rose_build_merge.cpp
index 121baa52ce0782e7754bd5422c63f4c019efce70..09c2175e2d9be2498e8df19275a1c73dedf0f931 100644 (file)
--- a/src/rose/rose_build_merge.cpp
+++ b/src/rose/rose_build_merge.cpp
@@ -32,7 +32,6 @@
  */
 #include "rose_build_merge.h"
 
-/* just a comment to trigger builds/tests */
 #include "grey.h"
 #include "rose_build.h"
 #include "rose_build_impl.h"