resolve conflicts caused by merge

funbringer · funbringer · commit 5faa32af65e2 · 2017-10-13T14:28:30.000+03:00
diff --git a/expected/pathman_bgw.out b/expected/pathman_bgw.out
@@ -200,7 +200,8 @@ BEGIN
 
 			ASSERT rows IS NOT NULL;
 
-			IF rows_old = rows THEN
+			-- rows should increase!
+			IF rows_old <= rows THEN
 				i = i + 1;
 			END IF;
 		ELSE
diff --git a/sql/pathman_bgw.sql b/sql/pathman_bgw.sql
@@ -114,7 +114,8 @@ BEGIN
 
 			ASSERT rows IS NOT NULL;
 
-			IF rows_old = rows THEN
+			-- rows should increase!
+			IF rows_old <= rows THEN
 				i = i + 1;
 			END IF;
 		ELSE
