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

fix broken merge conflict

This commit is contained in:
Enno Rehling 2015-06-08 08:52:24 +02:00
parent bafc7f8237
commit 59ddbf9f11
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/laws.test.c
View File

@ -712,13 +712,10 @@ static void test_peasant_luck_effect(CuTest *tc) {
statistic_test(tc, 100, 0, 1000, 0, 0, 0); statistic_test(tc, 100, 0, 1000, 0, 0, 0);
statistic_test(tc, 100, 2, 1000, 0, 1, 1); statistic_test(tc, 100, 2, 1000, 0, 1, 1);
<<<<<<< HEAD
=======
/* /*
statistic_test(tc, 1000, 400, 1000, 0, (int)(400 * 10 * 0.001 * .75), statistic_test(tc, 1000, 400, 1000, 0, (int)(400 * 10 * 0.001 * .75),
(int)(400 * 10 * 0.001 * .75)); (int)(400 * 10 * 0.001 * .75));
*/ */
>>>>>>> master
statistic_test(tc, 1000, 400, 1000, 0, 3, 3); statistic_test(tc, 1000, 400, 1000, 0, 3, 3);
statistic_test(tc, 1000, 1000, 2000, .5, 1, 501); statistic_test(tc, 1000, 1000, 2000, .5, 1, 501);