From 9a761d43e07452b4f299016c84d5f3a259fcf82e Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 14 Jan 2013 17:45:00 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20tnb=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC,=20=EC=84=A4=EB=AC=B8=EC=A1=B0=EC=82=AC=20me?=
 =?UTF-8?q?rge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/default.css             |   2 +-
 img/btn_search.jpg          | Bin 8443 -> 874 bytes
 img/search_bg.jpg           | Bin 9115 -> 9119 bytes
 img/tnb_bg.jpg              | Bin 9115 -> 9119 bytes
 skin/poll/neo/poll.skin.php |   4 ----
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/css/default.css b/css/default.css
index 31c895459..46adf8f79 100644
--- a/css/default.css
+++ b/css/default.css
@@ -81,7 +81,7 @@ a {color:#000;text-decoration:none}
 #tnb {position:absolute;top:0;left:0;width:100%;border-bottom:1px solid #000;background:url('../img/tnb_bg.jpg') #fff bottom left repeat-x;zoom:1}
 #tnb:after {display:block;visibility:hidden;clear:both;content:""}
 #tnb li {float:left}
-#tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #bbb;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em}
+#tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #ccc;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em}
 
 /* 전체검색 */
 #hdsch {z-index:3;position:absolute;top:0;right:0;margin:0;padding:0;width:220px;border:0;border-left:1px solid #bbb;background:url('../img/search_bg.jpg') #fff bottom left repeat-x}
diff --git a/img/btn_search.jpg b/img/btn_search.jpg
index 2ad4a1b6a2f4fb38dcccc2f000695d70eba485f3..ae0f6ee5075fd2f798f4b8efbc433442db628bc0 100644
GIT binary patch
delta 740
zcmezE_=?T=|Be3-7zDiBJlz-=nHU&SfRN$;8wNp_(&X$)21W)J29O}b|91?0jw$&`
zsSGIxCiBV!urM()GEGjD@v1+<P{qK&#LNg(hX9;x99)cy49q}`3>cZ1Sp*mu*ch1^
z+1O!HAVD^ERt65vg&!0XgC2<r23{1pBqGiw$iM^wjI3}Y7zLRW6NQulnLjudP7D(M
ze~W>q9%wU@AhRHYJ;TlXT^66ee#zctQe1pl`^x&t*^x~VYhM05_QLEd@3v2RQO3uw
zZrZ(Sdw<0Gx%+)hBete<oIWx0<eZ%qla?5{C<jYA&0txepty3@a`}KKk1BTP=!4D6
zTI_h<$M)j!`Rf<EWLUnODqZ&ZHXr*|+q37g%uesE-@0&i^)A)YZnLwOE1uqMm0hPY
zvm-j~&2?Xw*mZj*&Q20Eo^mwc5UYTIeB0bvj~=FR#H4y3ob%7J;_jo>g)zbI>(3rI
zzHr);OV1n6=;WSzx9-3+y;nEdZmpkoa`z_L{|xS@cUiwM^V@TV@xX!vEx$93v3r#7
z-wJe>4BEHdv$D>&UN>z$=l%_c|1+FFyEW^UOiW;8cd-4O8LQ>a-n=07tz3mY_3YWK
z4&BCiy$6lXvwrB_JXyRiA;-BegfafwF*SDKIXnwrUwPIQXm?KQP07AT_I8WET$@{?
zWcBmsPv!W^-wbt8JzOlilRvN@Go794p_8-KP_5r=rpN5l>Y_bd7v|O<T*cW|xqGP`
z_nj$BmUEK(j!q1{BFrVR`0?yzN=g%j4bQ3dKX-d_v07(}P@nmZ`&%krZuu@O*p|nc
zS$8y@U&>oUcfZHSpFCUk&6}0>DKFk9Fki3Y#oAd%qqb=VII?g(_*twMuGe+-cIfp}
zQ`d`qz7n=+Q~ZW|`#yhT__MV_iBGQlN9pC)8y{Hzv3l`(!vP@g;`PLa_a9y_UU!)N
G|4jhNAUL`J

literal 8443
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

diff --git a/img/search_bg.jpg b/img/search_bg.jpg
index fcf8b425a49583e4694f7a8310ad40b16b27aa28..3fdd862b2bbb7a7cfe559fee89ee4e1ebd4006fd 100644
GIT binary patch
delta 305
zcmbR3KHq(UIAhU7i3RNDR>qcAh9(pDS1{UawqP`6lAj-{!s#gz{r|%I?JA2VY1IF}
z_+BX9T%}9?|IPnz`L=EDWe#QK<+5<{^kv~;00O3n$?rMDnQa&(HhVEDGfCsozuA+!
zk`rd-<dY(5aP~KmNgR$&u1>Dz&PJ0bi2heFbu=?_bu@7?GBP!HwJ<aWa-B>q42|3z
zT`i1^O)NLB7wh3kKmPmTe+KjR--Z7fM87Tfe7UP{|Njej;@`FZ+WenE)%;KRtzYu<
zf9<!M_{#oR)&GmPC%=#W8~C3g|38EDxBcNBS+(qM{xc-6|9|PWyT^Zq8u5RcZ*!|$
Xum8V%+x?&CxBY)#FR9<Y{{Kw?)0Kj}

delta 301
zcmbR5KHGhQIAifdi3RMYR>me)29^`|S1{UcwqP`6QmBtUs~TS9vGD(ecjhXKCKbv5
zzxZ}iyp_tF_Ww8kzvbJpxraHFm6y}P$<vpGhXDwfA}7D&5NEb!kl5_SsLUjb&j5za
zZrqieFk2@d6H$Y+KZ{J_Ff(y+GdFcMoZKt=U%}GN#m(5o%+$o(#M05lz{JhS)WFTs
z(ZJc#(b&z^)p+w7u^yfT``^#%A8-GC{!jj`z3i8lnaca^|9|0j{rm90k^dPco&PKU
z=GgpK%RRDctNvfS)%>HmewF>F@IU!Cr~148+E;&i{r^k1<nF(&-&22a-<j1HORN50
Uz9s+9^IQ7wD*eBE>;K;b0R0k%e*gdg

diff --git a/img/tnb_bg.jpg b/img/tnb_bg.jpg
index fcf8b425a49583e4694f7a8310ad40b16b27aa28..3fdd862b2bbb7a7cfe559fee89ee4e1ebd4006fd 100644
GIT binary patch
delta 305
zcmbR3KHq(UIAhU7i3RNDR>qcAh9(pDS1{UawqP`6lAj-{!s#gz{r|%I?JA2VY1IF}
z_+BX9T%}9?|IPnz`L=EDWe#QK<+5<{^kv~;00O3n$?rMDnQa&(HhVEDGfCsozuA+!
zk`rd-<dY(5aP~KmNgR$&u1>Dz&PJ0bi2heFbu=?_bu@7?GBP!HwJ<aWa-B>q42|3z
zT`i1^O)NLB7wh3kKmPmTe+KjR--Z7fM87Tfe7UP{|Njej;@`FZ+WenE)%;KRtzYu<
zf9<!M_{#oR)&GmPC%=#W8~C3g|38EDxBcNBS+(qM{xc-6|9|PWyT^Zq8u5RcZ*!|$
Xum8V%+x?&CxBY)#FR9<Y{{Kw?)0Kj}

delta 301
zcmbR5KHGhQIAifdi3RMYR>me)29^`|S1{UcwqP`6QmBtUs~TS9vGD(ecjhXKCKbv5
zzxZ}iyp_tF_Ww8kzvbJpxraHFm6y}P$<vpGhXDwfA}7D&5NEb!kl5_SsLUjb&j5za
zZrqieFk2@d6H$Y+KZ{J_Ff(y+GdFcMoZKt=U%}GN#m(5o%+$o(#M05lz{JhS)WFTs
z(ZJc#(b&z^)p+w7u^yfT``^#%A8-GC{!jj`z3i8lnaca^|9|0j{rm90k^dPco&PKU
z=GgpK%RRDctNvfS)%>HmewF>F@IU!Cr~148+E;&i{r^k1<nF(&-&22a-<j1HORN50
Uz9s+9^IQ7wD*eBE>;K;b0R0k%e*gdg

diff --git a/skin/poll/neo/poll.skin.php b/skin/poll/neo/poll.skin.php
index cc473a927..33611b718 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><? } ?>
->>>>>>> f287dd35436bbb47931ae5b0fcf128755eb404d8
         <p><?=$po['po_subject']?></p>
     </header>
     <ul>