From c03ff7adf45d77faeae1707a43dc204b14e7fdec Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 3 Apr 2009 05:16:38 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6017
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/board/skins/xe_default/skin.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/board/skins/xe_default/skin.xml b/modules/board/skins/xe_default/skin.xml
index 5d5a16220..834c1c495 100644
--- a/modules/board/skins/xe_default/skin.xml
+++ b/modules/board/skins/xe_default/skin.xml
@@ -468,7 +468,6 @@
                 <title xml:lang="zh-TW">隱藏</title>
             </options>
         </var>
->>>>>>> .r5911
         <var name="duration_new" type="text" default="24">
             <title xml:lang="ko">new표시 시간 (hours)</title>
             <title xml:lang="jp">Newの表示時間 (Hours)</title>