From 30217193806701eb2e6159359f14bf9658d8a668 Mon Sep 17 00:00:00 2001
From: mc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 14 Dec 2004 01:14:14 +0000
Subject: git-svn-id:
 https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@567
 54d463be-8e91-2dee-dedb-b68131a5f0ec

---
 Changelog.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Changelog.txt')

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]
-- 
cgit v1.2.3-70-g09d2