From 146cb9b00d3f5ca9320eb4f0725e65ea1eef7b2f Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 26 Jan 2017 19:19:40 +0100
Subject: [PATCH] fix merge conflict

---
 src/study.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/study.c b/src/study.c
index fb87987fa..c6dc3b260 100644
--- a/src/study.c
+++ b/src/study.c
@@ -54,8 +54,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/umlaut.h>
 #include <selist.h>
 
-#include <quicklist.h>
-
 /* libc includes */
 #include <assert.h>
 #include <limits.h>