From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 12 Jan 2009 08:19:37 +0000 (-0000)
Subject: Bug #253745 - Remove collision-protect from the sample FEATURES list since
X-Git-Tag: v2.1.6.5~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b2b92e242e2bebcd49961c2f7ae2c705fb2d560;p=portage.git

Bug #253745 - Remove collision-protect from the sample FEATURES list since
protect-owned is enabled by default now. (trunk r12399)

svn path=/main/branches/2.1.6/; revision=12459
---

diff --git a/cnf/make.conf b/cnf/make.conf
index 8fd4ff8aa..e260b570b 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -240,7 +240,7 @@
 # FEATURES defines actions portage takes by default. This is an incremental
 # variable. See the make.conf(5) man page for a complete list of supported
 # values and their respective meanings.
-#FEATURES="ccache collision-protect distcc installsources \
+#FEATURES="ccache distcc installsources \
 # splitdebug test userpriv usersandbox"
 
 # CCACHE_SIZE and CCACHE_DIR are used to control the behavior of ccache, and