From e2607a3e7ca0d821d992acd5f3b7bb8c103a50b6 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 3 Feb 2019 04:17:11 +0100
Subject: [PATCH] fix merge error

---
 src/battle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/battle.c b/src/battle.c
index 52c7d8e9b..df937698f 100644
--- a/src/battle.c
+++ b/src/battle.c
@@ -600,7 +600,7 @@ weapon_skill(const weapon_type * wtype, const unit * u, bool attacking)
             /* wenn kein waffenloser kampf, dann den rassen-defaultwert */
             if (rc == get_race(RC_ORC)) {
                 int sword = effskill(u, SK_MELEE, NULL);
-                int spear = effskill(u, SK_SPEAR,NULL0);
+                int spear = effskill(u, SK_SPEAR, NULL);
                 skill = ((sword > spear) ? sword : spear) - 3;
             }
         }