From 950bf918501d0094e6ad83eb8d7a393595a67036 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 26 Nov 2015 18:48:21 +0100
Subject: [PATCH] fix merge conflict in PR #397 (config changes)

---
 src/economy.c      | 2 +-
 src/economy.test.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/economy.c b/src/economy.c
index a8658aa4c..0a360c094 100644
--- a/src/economy.c
+++ b/src/economy.c
@@ -2955,7 +2955,7 @@ void tax_cmd(unit * u, struct order *ord, request ** taxorders)
     static int taxperlevel = 0;
 
     if (!taxperlevel) {
-        taxperlevel = get_param_int(global.parameters, "taxing.perlevel", 0);
+        taxperlevel = config_get_int("taxing.perlevel", 0);
     }
 
     kwd = init_order(ord);
diff --git a/src/economy.test.c b/src/economy.test.c
index d41031aff..8cf337f4f 100644
--- a/src/economy.test.c
+++ b/src/economy.test.c
@@ -192,7 +192,7 @@ static void test_tax_cmd(CuTest *tc) {
 
 
     test_cleanup();
-    set_param(&global.parameters, "taxing.perlevel", "20");
+    config_set("taxing.perlevel", "20");
     test_create_world();
     f = test_create_faction(NULL);
     r = findregion(0, 0);