merge 충돌 수정

2013-10-14 17:28:13 +09:00
parent f2a5866c52 6f5803bb3c
commit 0fbb63a64c
79 changed files with 704 additions and 184 deletions
--- a/bbs/register_email.php
+++ b/bbs/register_email.php
@ -1,6 +1,6 @@
 <?php
 include_once('./_common.php');
-include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
+include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');

 $sql = " select mb_email, mb_datetime, mb_email_certify from {$g5['member_table']} where mb_id = '{$mb_id}' ";
 $mb = sql_fetch($sql);