From 2bb3e7601d96ae4703e53816332f6e99f199c9b1 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 5 Aug 2018 06:42:31 +0200
Subject: [PATCH] merge conflict

---
 clibs          | 2 +-
 src/automate.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/clibs b/clibs
index d86c85254..66a891b38 160000
--- a/clibs
+++ b/clibs
@@ -1 +1 @@
-Subproject commit d86c8525489d7f11b7ba13e101bb59ecf160b871
+Subproject commit 66a891b383f1a51bb0d4e5cf002530f7f70bf7f4
diff --git a/src/automate.c b/src/automate.c
index e08d7a625..2f188f352 100644
--- a/src/automate.c
+++ b/src/automate.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-int cmp_scholars(const void *lhs, const void *rhs)
+static int cmp_scholars(const void *lhs, const void *rhs)
 {
     const scholar *a = (const scholar *)lhs;
     const scholar *b = (const scholar *)rhs;