BlackArch/blackarch — pull request #376 by archey (2013-11-13 18:20:08+00:00)
Title: pull request

I had a merge conflict in my local repo, I attempted remove my version of ratproxy before I did a git merge upstream/unstable.

I thought by running git rm -r ratproxy under blackarch/packages would remove my local copy and merge in the upstream copy. However it looks like this merge might remove the ratproxy package from the unstable branch. This was not my intention, hopefully we will be able to pull the source in or we can decline to merge in this pull request.