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 8fd4ff8aa404f246d8c171e3dcba2fd8479d0799..e260b570be2baae885c3692d3b04ef34a64cd941 100644 (file)
--- 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