From edd0b0d53d69eec67ee2cab47e54eb837b64b8e5 Mon Sep 17 00:00:00 2001
From: Jeongkyu Shin <inureyes@gmail.com>
Date: Tue, 12 Feb 2013 21:04:48 +0900
Subject: [PATCH] refs #514: bugfix: merging process created error.

---
 interface/common/owner/header.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/interface/common/owner/header.php b/interface/common/owner/header.php
index 305ed9979..28c68e02d 100644
--- a/interface/common/owner/header.php
+++ b/interface/common/owner/header.php
@@ -382,16 +382,6 @@
 ?>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.path').$context->getProperty('panel.skin');?>/custom.js"></script>
 <?php
-<<<<<<< HEAD
-=======
-}
-if($service['interface'] == 'simple') {
-	if(!in_array($blogMenu['contentMenu'],array('post','edit'))) {
-?>
-	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/mootools.js"></script>
-<?php
-	}
->>>>>>> fcadc1d...  refs #1604 : desktop-mobile change now works.
 }
 if( isset($service['admin_script']) ) {
 	if( is_array($service['admin_script']) ) {