From 7c92dbaeaea9db3f87397d224c80fa5fe98cb5ec Mon Sep 17 00:00:00 2001 From: oranges Date: Mon, 18 Jul 2016 11:31:05 +1200 Subject: [PATCH] Revert "REMOVES COATS OF IGNORANCE" (#19363) --- CONTRIBUTING.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b529fd89d2f..27cc7d4835a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -280,9 +280,6 @@ There is no strict process when it comes to merging pull requests, pull requests * If your pull request is accepted, the code you add no longer belongs exclusively to you but to everyone; everyone is free to work on it, but you are also free to object to any changes being made, which will be noted by a Project Lead or Project Manager. It is a shame this has to be explicitly said, but there have been cases where this would've saved some trouble. -####Merge tokens -At the moment there is a system in place for feature/balance pull requests that intend to change gameplay in some form. This system works such that for every feature/balance pull request, you must have a valid bugfix. (Pull requests can have multiple bugfixes, so these pull requests would count as N tokens, instead of just one.) This system is in place indefinitely, it may be removed in the future if we take the number of bugs down to a reasonable number, or it may never be removed. - ## Banned content Do not add any of the following in a Pull Request or risk getting the PR closed: - National Socialist Party of Germany content, National Socialist Party of Germany related content, or National Socialist Party of Germany references