From 1116afed2b0a795bb4f2a21d3db682fd611d1940 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Wed, 26 Oct 2016 18:09:51 +0200
Subject: [PATCH] merge conflict resolve

---
 src/alchemy.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/alchemy.c b/src/alchemy.c
index a0a9d1ef2..11a205869 100644
--- a/src/alchemy.c
+++ b/src/alchemy.c
@@ -20,7 +20,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include "alchemy.h"
 #include "guard.h"
-#include "move.h"
 #include "skill.h"
 #include "study.h"