...
[15:15:49 CDT(-0500)] <athena> seems like something got pretty screwed up in my fork
[15:17:46 CDT(-0500)] <athena> yeah, guessing i must have screwed up this merge somehow
[15:17:59 CDT(-0500)] <athena> https://github.com/bourey/uPortal/commit/c145935bde1d1e607947d784eb3604c9379cc26e
[15:18:14 CDT(-0500)] <athena> my fork thinks those are all brand new commits that aren't on the uportal side now