From 6e560980a4ef8416a56bad72858877cbfb665f1b Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Tue, 15 Jan 2013 09:57:37 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=84=A4?=
 =?UTF-8?q?=EB=AC=B8=EC=A1=B0=EC=82=AC=20=EC=8A=A4=ED=82=A8=20merge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skin/poll/neo/poll.skin.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/skin/poll/neo/poll.skin.php b/skin/poll/neo/poll.skin.php
index 291be10d3..402777a33 100644
--- a/skin/poll/neo/poll.skin.php
+++ b/skin/poll/neo/poll.skin.php
@@ -19,11 +19,7 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
 <section id="poll">
     <header>
         <h2>설문조사</h2>
-<<<<<<< HEAD
-        <? if ($is_admin == "super") { ?><a href="<?=$g4['admin_url']?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
-=======
         <? if ($is_admin == "super") { ?><a href="<?=$g4[admin_path]?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문관리</a><? } ?>
->>>>>>> 8acf7f8c214b606db9e4d7b3533a916ca4171b83
         <p><?=$po['po_subject']?></p>
     </header>
     <ul>