From 67702ced9c99ae2b52f237a789bfbfbd535b0b48 Mon Sep 17 00:00:00 2001
From: kobra_k88 <kobra_k88@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 6 Nov 2004 10:50:00 +0000
Subject: git-svn-id:
 https://rathena.svn.sourceforge.net/svnroot/rathena/athena@23
 54d463be-8e91-2dee-dedb-b68131a5f0ec

---
 conf-tmpl/map_athena.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf
index 0769aef9b..266c0ce40 100644
--- a/conf-tmpl/map_athena.conf
+++ b/conf-tmpl/map_athena.conf
@@ -273,8 +273,9 @@ npc: npc/kafras/kafras_new.txt
 
 
 //---------------------------- Events --------------------------------
-npc: npc/events/easter.txt
+//npc: npc/events/easter.txt
 //npc: npc/events/valentinesday.txt
+//npc: npc/events/xmas.txt
 //npc: npc/events/alchemist.txt
 //npc: npc/events/twintowers.txt
 npc: npc/events/custom/uneasy_cemetery.txt
@@ -1163,4 +1164,4 @@ import: conf/import/map_conf.txt
 imalive_on: 0
 imalive_time: 30
 flush_on: 0
-flush_time: 30 
\ No newline at end of file
+flush_time: 30 
-- 
cgit v1.2.3-70-g09d2