firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

머지 충돌 해결

Browse Source
This commit is contained in:
gnuboard
2013-01-18 10:08:41 +09:00
parent 4830746aff
commit f453bcf51b
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
head.sub.php
View File

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