From 7c473258a84833615a9c9bfebdd0819556f047e8 Mon Sep 17 00:00:00 2001
From: shadowlady <shadowlady@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 20 Nov 2004 23:11:05 +0000
Subject: Fixed new Amon Ra spawn point on morroc pyramids B2

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@283 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'npc')

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index e440f8b1b..57bf19168 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,9 +34,9 @@ Other Ppl
 
 Date		Added
 ======
-<<<<<<< .mine
+
 11/20
-	* Fixed spawns on umbala fields [shadow]
+	* Fixed spawns on umbala fields, Fixed spawn point of Amon Ra in morroc pyramids B2 [shadow]
 11/21
 	* niflheim.txt: some typos in some variables fixed (thx 2 Dr.Evil) [Lupus]
 
-- 
cgit v1.2.3-70-g09d2