fixed conflict
authorKurund Jalmi <kurund@civicrm.org>
Tue, 30 Apr 2013 06:12:33 +0000 (23:12 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Tue, 30 Apr 2013 06:12:33 +0000 (23:12 -0700)
commit7b20672a901df807a0e20037a4c473cb439edecd
tree2b319772a687526d67a65593846b3368ee4af848
parent5186febd0facb6dc5e0a4c70055029bf1825b6a2
parent5c61cec22ca24a86efe844223f66f25570ecccce
fixed conflict
sql/civicrm_generated.mysql