# HG changeset patch
# User Simon Cross <hodgestar@gmail.com>
# Date 1302131682 -7200
# Node ID 9e2949210c07cc15794bb359046f8ee7ebf7d6fe
# Parent  c83f021cc327e514acebdef2ed4e6d10050fedeb# Parent  2d5dfec4cd11029ab0700d765d518354ceadd30d
Fix merge.

diff -r c83f021cc327 -r 9e2949210c07 data/npcs/kitsune.json
--- a/data/npcs/kitsune.json	Thu Apr 07 01:07:15 2011 +0200
+++ b/data/npcs/kitsune.json	Thu Apr 07 01:14:42 2011 +0200
@@ -26,7 +26,7 @@
     "battle" : {
         "events" : [
             { "matches" : "world.battle_lost", "next": "state.lost" },
-            { "matches" : "world.battle_won", "next": "state.won" },
+            { "matches" : "world.battle_won", "next": "state.won" }
         ]
     },
     "haiku1" : {
@@ -64,7 +64,7 @@
         "events" : [
             { "matches" : "world.haiku_wins == 1 and world.haiku_losses == 0", "next": "state.haiku_1win_0loss" },
             { "matches" : "world.haiku_wins == 1 and world.haiku_losses == 1", "next": "state.haiku_1win_1loss" },
-            { "matches" : "world.haiku_wins == 2", "next": "state.haiku_2wins" },
+            { "matches" : "world.haiku_wins == 2", "next": "state.haiku_2wins" }
         ]
     },
     "haiku_1win_0loss" : {