diff options
Diffstat (limited to 'graphics/sprites/npcs/xml/richard.xml')
| -rw-r--r-- | graphics/sprites/npcs/xml/richard.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml index c307b530..be90738d 100644 --- a/graphics/sprites/npcs/xml/richard.xml +++ b/graphics/sprites/npcs/xml/richard.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> +<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a <!-- Author: Micksha +======= +<!-- Author: Reid +>>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard. Copyright (C) 2015 Evol Online --> <sprite> |