From 4fdfbb44b59b10ca298ab3ad4976725f96599936 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Mon, 8 May 2017 08:15:18 +0200
Subject: [PATCH] this config.xml was added by accident.

---
 conf/e2/config.xml | 24 ------------------------
 s/setup            |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 conf/e2/config.xml

diff --git a/conf/e2/config.xml b/conf/e2/config.xml
deleted file mode 100644
index 0de6bff76..000000000
--- a/conf/e2/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<eressea xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <xi:include href="config://game/familiars.xml"/>
-  <xi:include href="config://game/equipment.xml"/>
-  <equipment>
-    <set name="autoseed_unit">
-      <item name="log" amount="50"/>
-      <item name="stone" amount="50"/>
-      <item name="iron" amount="50"/>
-      <item name="laen" amount="10"/>
-      <item name="sword" amount="1"/>
-      <item name="mallorn" amount="10"/>
-      <item name="skillpotion" amount="5"/>
-      <item name="p2" amount="5"/>
-      <item name="money" amount="20000"/>
-      <skill name="perception" level="30"/>
-      <skill name="melee" level="1"/>
-    </set>
-    <set name="autoseed_faction">
-      <item name="adamantium" amount="1"/>
-    </set>
-  </equipment>
-</eressea>
diff --git a/s/setup b/s/setup
index e3e8e113d..adf4e0b85 100755
--- a/s/setup
+++ b/s/setup
@@ -56,7 +56,7 @@ done
 [ -z $INIFILE ] && INIFILE=$TOOLS/inifile
 [ -e $INIFILE ] || INIFILE=$TOOLS/iniparser/inifile
 
-[ -e $SOURCE/conf/$rules/config.xml ] || abort "cannot find conf/$rules/config.xml"
+[ -e $SOURCE/conf/$rules/config.json ] || abort "cannot find conf/$rules/config.json"
 
 cd $ERESSEA
 if [ -d $dir ] ; then