From fff9c1f556e21115d07a7ecb2faa6c117e2adc4f Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Wed, 23 May 2012 22:37:06 +0200
Subject: Correct merge problems on npcs.xml .

---
 npcs.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'npcs.xml')

diff --git a/npcs.xml b/npcs.xml
index 7f6c7ed5..d1c02959 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -103,6 +103,10 @@ IDs 990-999 = Special
         <!-- Tritan-Man, standing around a barrel. -->
         <sprite>npcs/xml/sapartan.xml</sprite>
     </npc>
+    <npc id="316">
+        <!-- Tritan-Man, hitting a palm tree. -->
+        <sprite>npcs/xml/tarlan.xml</sprite>
+    </npc>
 
 
 <!-- Special NPCs -->
-- 
cgit v1.2.3-60-g2f50