...
[13:13:48 CDT(-0500)] <js70> your weird:^)
[13:14:02 CDT(-0500)] <js70> you are weird. :^)
[13:18:49 CDT(-0500)] <js70> Just to be clear, I think weird is good thing and thanks for the acknowledgement for the team.
[13:24:53 CDT(-0500)] <dmccallum54> naturally
[13:26:18 CDT(-0500)] <js70> out for lunch.
[13:26:27 CDT(-0500)] <TonyUnicon> hah
[18:04:11 CDT(-0500)] <dmccallum54> js70 i'm having trouble merging c5218bd368c44394e9ee96373531ed700432ea11 into master. conflcts in DisabilityServicesReportControllerIntegrationTest.java. looks like there were recent changes https://github.com/Jasig/SSP/commit/f37a320a6bf9557f962c747a532b32ee3d82c4b8
[18:04:54 CDT(-0500)] <js70> k
[18:04:56 CDT(-0500)] <dmccallum54> is it reasonable to assume that the current state of that test class in master is correct? i.e. i can just discard the inbound diff from rel-1-2 and go with what's already in master?
[18:05:16 CDT(-0500)] <dmccallum54> looks like that patch was nearly a wholesale replacement
[18:05:17 CDT(-0500)] <js70> yes.
[18:05:21 CDT(-0500)] <dmccallum54> ok cool
[18:05:22 CDT(-0500)] <dmccallum54> thx