Merge branch 'master' of github.com:gnuboard/g4s

Conflicts:
	skin/member/neo/memo_form.skin.php

skin/member/neo/memo_form.skin.php

@@ -2,7 +2,6 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 
 ?>
 
-
 <div id="memo_write" class="new_win">
     <h1>쪽지보내기</h1>
 
@@ -27,12 +26,22 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
         <th scope="row"><label for="me_memo">내용</label></th>
         <td><textarea id="me_memo" name="me_memo" required><?=$content?></textarea></td>
     </tr>
+    <tr>
+        <th scope="row">자동등록방지</th>
+        <td>
+            <?=captcha_html();?>
+        </td>
+    </tr>
     </tbody>
     </table>
 
+<<<<<<< HEAD
     <?=captcha_html();?>
 
     <div class="btn_window btn_confirm">
+=======
+    <div class="btn_win">
+>>>>>>> 41f59fa9ae589fc22660fde7d19293f195aede31
         <input type="submit" id="btn_submit" class="btn_submit" value="보내기">
         <a href="javascript:window.close();">창닫기</a>
     </div>