From df8f030102e07c1fb1080f1c8f999e8c1a76f296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Sat, 1 May 2021 10:36:24 -0400
Subject: [PATCH] Fix merge issue.
---
src/syncterm/ripper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/syncterm/ripper.c b/src/syncterm/ripper.c
index 0f4e817c34..df30a597d3 100644
--- a/src/syncterm/ripper.c
+++ b/src/syncterm/ripper.c
@@ -13535,7 +13535,7 @@ parse_rip(BYTE *origbuf, unsigned blen, unsigned maxlen)
}
void
-init_rip(int enabled)
+init_rip(int version)
{
FREE_AND_NULL(rip.xmap);
FREE_AND_NULL(rip.ymap);
--
GitLab