summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/sprites/npcs/xml/rumli.xml1
-rw-r--r--npcs.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/graphics/sprites/npcs/xml/rumli.xml b/graphics/sprites/npcs/xml/rumli.xml
index 9988cca4..ebf11328 100644
--- a/graphics/sprites/npcs/xml/rumli.xml
+++ b/graphics/sprites/npcs/xml/rumli.xml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<?xml version="1.0"?>
<!-- Author : Reid
Copyright (C) 2010-2015 Evol Online -->
diff --git a/npcs.xml b/npcs.xml
index 4135520f..ef36132d 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -433,6 +433,7 @@ IDs 990-999 = Special
<npc id="444">
<!-- Demon Male, Stat reseter NPC -->
<sprite>npcs/xml/rumli.xml</sprite>
+ <menu name="Talk" command="talk 'NAME'"/>
</npc>
<!-- Test NPCs -->