summaryrefslogtreecommitdiff
path: root/Changelog.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Changelog.txt')
-rw-r--r--Changelog.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt
index af2df756c..58cf88067 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -32,7 +32,6 @@ Date Added
rollback - fix by Freya [celest]
* Removed 'type' paramater from pc_unequipitem to use 'flag' instead[celest]
* Moved unequip checking code from clif.c to pc.c [celest]
->>>>>>> .r565
* Replaced many printf's in map-server with _ShowMessage(). [MC Cameri]
* Skill timers for skills with id's higher then 450 were
corrupting memory [MouseJstr]