summaryrefslogtreecommitdiffstats
path: root/cnf
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-12 08:19:37 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-12 08:19:37 +0000
commit3b2b92e242e2bebcd49961c2f7ae2c705fb2d560 (patch)
tree23b1f26732ea503530e8de6d7e827fe00bc8358d /cnf
parent5c0ad1463b7d48fa940ed49938816cddcddc55ad (diff)
downloadportage-3b2b92e242e2bebcd49961c2f7ae2c705fb2d560.tar.gz
portage-3b2b92e242e2bebcd49961c2f7ae2c705fb2d560.tar.bz2
portage-3b2b92e242e2bebcd49961c2f7ae2c705fb2d560.zip
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
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.conf2
1 files changed, 1 insertions, 1 deletions
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