From: G.E <gregory.economou@vectorcamp.gr>
Date: Sun, 5 May 2024 15:26:20 +0000 (+0300)
Subject: maybe fix broken merge
X-Git-Tag: vectorscan/5.4.12^2~52^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82cf36724e79805848b04d25cd7a34353b3142db;p=thirdparty%2Fvectorscan.git

maybe fix broken merge
---

diff --git a/src/nfagraph/ng_extparam.cpp b/src/nfagraph/ng_extparam.cpp
index 2b492f73..abfe367e 100644
--- 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 121baa52..09c2175e 100644
--- 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"