From 02a79264bd8e6d2c36c198e92ef0d1ed579faf85 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Tue, 30 Dec 2014 00:07:47 +1100
Subject: [PATCH] Include utils only once, from main

---
 data/campaigns/tutorial/_main.cfg                        | 3 ++-
 data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg | 2 --
 data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg | 1 -
 data/campaigns/tutorial/{scenarios => utils}/utils.cfg   | 0
 4 files changed, 2 insertions(+), 4 deletions(-)
 rename data/campaigns/tutorial/{scenarios => utils}/utils.cfg (100%)

diff --git a/data/campaigns/tutorial/_main.cfg b/data/campaigns/tutorial/_main.cfg
index eb0ad93f017..5afc21dd9ad 100644
--- a/data/campaigns/tutorial/_main.cfg
+++ b/data/campaigns/tutorial/_main.cfg
@@ -6,4 +6,5 @@
     {campaigns/tutorial/units}
 [/units]
 
-{campaigns/tutorial/scenarios}
\ No newline at end of file
+{campaigns/tutorial/utils}
+{campaigns/tutorial/scenarios}
diff --git a/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg b/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
index 7cdd98faf65..dccd1bdd0d2 100644
--- a/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
+++ b/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
@@ -5,8 +5,6 @@
 # wmllint: no-syntax-rewrite
 # wmllint: directory spelling quintain
 
-{./utils.cfg}
-
 #define TARGET_HEX X Y
     {VARIABLE target_hex.x {X}}
     {VARIABLE target_hex.y {Y}}
diff --git a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
index b4a2f38aa58..c977bce8cbd 100644
--- a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
+++ b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
@@ -1,5 +1,4 @@
 #textdomain wesnoth-tutorial
-{./utils.cfg}
 
 #define BADGUY TYPE NAME POSITION
     [unit]
diff --git a/data/campaigns/tutorial/scenarios/utils.cfg b/data/campaigns/tutorial/utils/utils.cfg
similarity index 100%
rename from data/campaigns/tutorial/scenarios/utils.cfg
rename to data/campaigns/tutorial/utils/utils.cfg