[13:14:25 CDT(-0500)] <athena> EricDalquist: i think this pull request is now ready to be merged into trunk: https://github.com/Jasig/uPortal/pull/80
[13:14:32 CDT(-0500)] <athena> it has a lot of merges from trunk back though
[13:14:44 CDT(-0500)] <athena> do we want to clean this up before pulling it?
[13:14:45 CDT(-0500)] <EricDalquist> cool
[13:14:47 CDT(-0500)] <EricDalquist> sure
[13:14:52 CDT(-0500)] <EricDalquist> are you interested in learning how to do that?
[13:14:56 CDT(-0500)] <athena> sure
[13:15:01 CDT(-0500)] <athena> i assume this requires a rebase, perhaps?
[13:15:06 CDT(-0500)] <EricDalquist> yup
[13:15:09 CDT(-0500)] <EricDalquist> so on that page
[13:15:18 CDT(-0500)] <athena> yeah, saw you'd added some notes about that
[13:15:21 CDT(-0500)] <EricDalquist> the little i in a circle to the left of the merge button