I realized I made changes in staging to grab the people directory info that conflicts in a few small places with the branch changes. I can clean that up but will have to manually resolve the conflicts. Also I renamed a class or two which affects things.
I realized I made changes in staging to grab the people directory info that conflicts in a few small places with the branch changes. I can clean that up but will have to manually resolve the conflicts. Also I renamed a class or two which affects things.