summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 282d8888d..6836b4a5b 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -18,10 +18,6 @@ Date Added
prep for unleasing it on the sql using public [MouseJstr]
* Fixed some SQL queries crashing char server [davidsiaw]
* Added several PID GM commands, thanks to Dino9021 [nsstrunks]
-
-12/18
-=======
->>>>>>> .r637
* Storage was merging items incorrectly [Mousejstr]
* eliminated a uninitialized var when using afm maps [MouseJstr]
* Added concept of dirty storage to reduce saves/load