merge 충돌 수정

2013-05-06 20:14:49 +09:00
parent 2089f7653d ed54791188
commit 1b052d2591
6 changed files with 52 additions and 29 deletions
--- a/head.sub.php
+++ b/head.sub.php
@ -78,7 +78,8 @@ if ($is_admin) {
 if(G4_IS_MOBILE) {
    echo '<script> set_cookie("device_width", screen.width, 6, g4_cookie_domain); </script>'.PHP_EOL;
 }
-echo $config['cf_add_script'];
+if(!defined('G4_IS_ADMIN'))
+    echo $config['cf_add_script'];
 ?>
 </head>
 <body>