From f453bcf51bac558af19f8103f4b4abc397e3ccd1 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 18 Jan 2013 10:08:41 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A8=B8=EC=A7=80=20=EC=B6=A9=EB=8F=8C=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 head.sub.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/head.sub.php b/head.sub.php
index 8963ba7ba..825ed01ca 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -61,15 +61,12 @@ if (G4_IS_MOBILE) {
 }
 ?>
 <title><?=$g4['title']?></title>
-<<<<<<< HEAD
-=======
 <!-- <meta http-equiv='X-UA-Compatible' content='IE=Edge'> -->
 <? if (isset($administrator)) { ?>
 <link rel="stylesheet" href="<?=$g4['url']?>/css/adm.css?=<?=date("md")?>">
 <? } else { ?>
 <link rel="stylesheet" href="<?=$g4['url']?>/css/default.css?=<?=date("md")?>">
 <?}?>
->>>>>>> fca2c7be504cccbd5466136a893f3d3ed875554c
 <!--[if lte IE 8]>
 <script src="<?=$g4['url']?>/js/html5.js"></script>
 <![endif]-->