ここの情報は古いです。ご理解頂いた上でお取り扱いください。

Changeset 1211


Ignore:
Timestamp:
Dec 15, 2006, 8:15:13 PM (15 years ago)
Author:
takanashi
Message:

コンフリクト部分解消

File:
1 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/takanashi/prj_takanashi4/webapp/lib/db/deprecated_temporary2.php

    r1208 r1211  
    5555    return db_commu_is_c_commu_view4c_commu_idAc_member_id($c_commu_id,$c_member_id);
    5656}
    57 <<<<<<< .working
    58 =======
    59 /*
    60 
    61 function db_commu_is_receive_mail_ktai($c_commu_id, $c_member_id)
    62 {
    63     return db_commu_is_receive_mail_ktai($c_commu_id, $c_member_id);
    64 }
    65 function db_commu_is_receive_mail_pc($c_commu_id, $c_member_id)
    66 {
    67     return db_commu_is_receive_mail_pc($c_commu_id, $c_member_id);
    68 }
    69 
    70 function db_commu_is_receive_message($c_commu_id, $c_member_id)
    71 {
    72     return db_commu_is_receive_message($c_commu_id, $c_member_id);
    73 }
    74 
    75 function db_common_receive_ktai_address_list4c_commu_id($c_commu_id)
    76 {
    77     return db_common_receive_ktai_address_list4c_commu_id($c_commu_id);
    78 }
    79 
    80 function db_common_receive_pc_address_list4c_commu_id($c_commu_id)
    81 {
    82     return db_common_receive_pc_address_list4c_commu_id($c_commu_id);
    83 }
    84 */
    85 >>>>>>> .merge-right.r1103
    8657function _db_c_commu_admin_confirm4c_commu_admin_confirm_id($c_commu_admin_confirm_id)
    8758{
Note: See TracChangeset for help on using the changeset viewer.