Closed bastik-1001 closed 9 years ago
@bastik-tor I played with a clone of your repo trying to do something about this mess. Try
git remote add -f upstream https://github.com/futpib/policeman.git # if you don't have it already
git rebase -m -s ours upstream/master
before next pull request.
You missed to merge the translation for the domain and host rulesets. That's the only reason I open a new pull request.