From 9c26ed8fbcecf242d905702143eab6e019ea6b7c Mon Sep 17 00:00:00 2001
From: mc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 19 Dec 2004 14:53:44 +0000
Subject: [PATCH] git-svn-id:
 https://svn.code.sf.net/p/rathena/svn/branches/stable@639
 54d463be-8e91-2dee-dedb-b68131a5f0ec

---
 Changelog.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 282d8888dc..6836b4a5bd 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