diff options
| author | jesusalva <cpntb1@ymail.com> | 2018-02-17 23:32:32 -0200 |
|---|---|---|
| committer | jesusalva <cpntb1@ymail.com> | 2018-02-17 23:32:32 -0200 |
| commit | 5abe9d3f5d91148a0e783f7829e89357c1042591 (patch) | |
| tree | b58f54eaffddd1378b2705a9da1789725b42666e | |
| parent | 2071b8231a7a6cfbdd4d6d0a6fdee7c1c85fa378 (diff) | |
| download | clientdata-5abe9d3f5d91148a0e783f7829e89357c1042591.tar.gz clientdata-5abe9d3f5d91148a0e783f7829e89357c1042591.tar.bz2 clientdata-5abe9d3f5d91148a0e783f7829e89357c1042591.tar.xz clientdata-5abe9d3f5d91148a0e783f7829e89357c1042591.zip | |
Fix unresolved merge conflict
| -rw-r--r-- | items.xml | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -3457,7 +3457,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml. <item from="-15" to="-19"/> </replace> </item> - <item id="2941" + <item id="2941" image="equipment/head/vikinghelmet.png" name="Viking Helmet" description="Rakinorf" @@ -3472,11 +3472,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml. <item from="-15" to="-19"/> </replace> </item> -<<<<<<< HEAD <item id="2942" -======= - <item id="2942" ->>>>>>> delete evol maps image="equipment/head/centurionhelmet.png" name="Centurion Helmet" description="Rakinorf" |