...
[17:26:26 CDT(-0500)] <JasonElwood> exactly
[18:35:00 CDT(-0500)] <dmccallum54> js70 i'm trying to cherry-pick SSP-650 into master from rel-1-2-patches. cherry pick of the 1st of those commits (4a5c07594e05014370f451af9103c7b37c90af72) results in a huge conflict on src/main/jasperreports/disabilityServices.jrxml
[18:35:17 CDT(-0500)] <dmccallum54> is it reasonable to assume the entire rel-1-2-patches version of that file is the authoritative version?
[18:35:33 CDT(-0500)] <js70> definitely.
[18:35:40 CDT(-0500)] <dmccallum54> sweet. thx