Fix bad merge in civicrm_generated.mysql
authorTim Otten <totten@civicrm.org>
Tue, 5 Mar 2013 02:17:27 +0000 (21:17 -0500)
committerTim Otten <totten@civicrm.org>
Tue, 5 Mar 2013 02:17:27 +0000 (21:17 -0500)
commit8dd0100cee6e98708701322b2a7b4cbbf4cce26b
tree04239b0070f223040fa0c1ff87bba8268dd730cd
parentcf2b13d63ecad545f0275b215d77a6417f1903c0
Fix bad merge in civicrm_generated.mysql
sql/civicrm_generated.mysql