Merge pull request #7900 from sarehag/CRM-17558
authorcolemanw <coleman@civicrm.org>
Wed, 9 Mar 2016 15:46:17 +0000 (10:46 -0500)
committercolemanw <coleman@civicrm.org>
Wed, 9 Mar 2016 15:46:17 +0000 (10:46 -0500)
commitd6771d38e28ae45ae746cf6851fca9468729d410
treef19b3a975f074374157df237e0bbaf6a48daf900
parent0545a8110e8f0fb3ed364285692c84d2a7b91a1f
parentea72e63ca4ce4ae30385e2aa88f928490cc7d007
Merge pull request #7900 from sarehag/CRM-17558

Crm 17558:Resolving conflicted for labels by changing id for one group.