diff options
| author | Reid <reidyaro@gmail.com> | 2012-05-23 22:37:06 +0200 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-05-23 22:37:06 +0200 |
| commit | fff9c1f556e21115d07a7ecb2faa6c117e2adc4f (patch) | |
| tree | acb9d92b831296b28f9a367e5d112dbc06b732ad /npcs.xml | |
| parent | 6f2dbcf04e05fb29577f46f1a8081cf82fffd8f3 (diff) | |
| download | clientdata-fff9c1f556e21115d07a7ecb2faa6c117e2adc4f.tar.gz clientdata-fff9c1f556e21115d07a7ecb2faa6c117e2adc4f.tar.bz2 clientdata-fff9c1f556e21115d07a7ecb2faa6c117e2adc4f.tar.xz clientdata-fff9c1f556e21115d07a7ecb2faa6c117e2adc4f.zip | |
Correct merge problems on npcs.xml .
Diffstat (limited to 'npcs.xml')
| -rw-r--r-- | npcs.xml | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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 --> |