refs #514: bugfix: merging process created error.

Needlworks · Feb 12, 2013 · edd0b0d · edd0b0d
1 parent 50ca1cb
commit edd0b0d
Showing 1 changed file with 0 additions and 10 deletions.
diff --git 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']) ) {