Attempt to clean up codeberg merge conflicts

It is not clear if the codeberg merge conflicts are due to a bug mentioned here https://github.com/go-gitea/gitea/issues/9014#issuecomment-1191518824, or due to some mistake on my part earlier keeping codeberg completely up to date with the builds. But so far, I'm not finding such a mistake, so this is an experiment to see if I can clean up codeberg vf this way.

This branch is a copy of the acct-res branch, with master merged in successfully. I also deleted the event-resource file that was already removed from the nav, just to clean that up. And rebuilt the site and re-tested locally.