Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix merge conflict in PR #397 (config changes)

This commit is contained in:
Enno Rehling 2015-11-26 18:48:21 +01:00
parent 6ad5db8e22
commit 950bf91850
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/economy.c
View File

@ -2955,7 +2955,7 @@ void tax_cmd(unit * u, struct order *ord, request ** taxorders)
static int taxperlevel = 0; static int taxperlevel = 0;
if (!taxperlevel) { if (!taxperlevel) {
taxperlevel = get_param_int(global.parameters, "taxing.perlevel", 0); taxperlevel = config_get_int("taxing.perlevel", 0);
} }
kwd = init_order(ord); kwd = init_order(ord);

2
src/economy.test.c
View File

@ -192,7 +192,7 @@ static void test_tax_cmd(CuTest *tc) {
test_cleanup(); test_cleanup();
set_param(&global.parameters, "taxing.perlevel", "20"); config_set("taxing.perlevel", "20");
test_create_world(); test_create_world();
f = test_create_faction(NULL); f = test_create_faction(NULL);
r = findregion(0, 0); r = findregion(0, 0);