g4s merge 충돌 수정

2013-06-26 12:04:11 +09:00
parent a49a7e9747 865035aff0
commit 8d8b107b70
9 changed files with 55 additions and 22 deletions
--- a/head.php
+++ b/head.php
@ -121,12 +121,14 @@ if ($config['cf_include_head']) {
                    새글
                </a>
            </li>
+
            <li>
                <a href="<?php echo G4_SHOP_URL ?>/">
                    <img src="<?php echo G4_IMG_URL ?>/tnb_shop.jpg" alt="">
                    쇼핑몰
                </a>
            </li>
+
        </ul>

    </div>