From: colemanw <coleman@civicrm.org>
Date: Wed, 9 Mar 2016 15:46:17 +0000 (-0500)
Subject: Merge pull request #7900 from sarehag/CRM-17558
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d6771d38e28ae45ae746cf6851fca9468729d410;p=civicrm-core.git

Merge pull request #7900 from sarehag/CRM-17558

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

d6771d38e28ae45ae746cf6851fca9468729d410