Merge branch 'master' into lukeshu/xbs

Conflicts:
	get-repos
	yf-update

1 files changed, 0 insertions, 32 deletions

diff --git a/yf/your-freedom.install b/yf/your-freedom.install
deleted file mode 100644
index 731a575..0000000
--- a/yf/your-freedom.install
+++ /dev/null
@@ -1,32 +0,0 @@
-
-pre_install() {
-  cat <<EOM
-  == IMPORTANT NOTICE ==
-
-  This package will help you identify nonfree packages that are installed
-  on your system at the time of it's installation, as well as protecting
-  you from (accidentally) installing them.
-
-  Also, if any other nonfree package is identified, later updates will ask
-  you for it's removal.
-
-  Have in mind that, if you want to retain certain nonfree packages
-  installed on your system, you'll have to remove your-freedom :)
-
-  If you find out any of the following:
-  * Cascade package removal due to nonfree dependencies,
-  * Your-freedom conflicting with a *-libre package,
-  * Etc.
-
-  Please report back to the Parabola Project on the usual channels:
-  * http://bugs.parabolagnulinux.org
-  * irc://freenode.net/#parabola
-  * mailto:dev@list.parabolagnulinux.org
-EOM
-}
-
-pre_upgrade() {
-  pre_install
-}
-
-# vim:set ts=2 sw=2 et: