summaryrefslogtreecommitdiff
path: root/testing/ypbind-mt/nisdomainname.conf
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-09-21 12:49:53 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-09-21 12:49:53 -0300
commitc02976460621a16b172e3e33432d5790f3ed6117 (patch)
treec438b11c18e36170fd5ee7c767adda3f948e45bb /testing/ypbind-mt/nisdomainname.conf
parent79f56eaaa1e752a2f67072051b612acf5c648f69 (diff)
parentae08410274473c5ab78d300ea2365c4b1070cc61 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: extra/bdf-unifont/PKGBUILD extra/convmv/PKGBUILD extra/cowsay/PKGBUILD extra/curl/PKGBUILD extra/dbus-qt3/PKGBUILD extra/emovix/PKGBUILD extra/foobillard/PKGBUILD extra/gnome-spell/PKGBUILD extra/libssh2/PKGBUILD extra/mkbootcd/PKGBUILD extra/mozilla-common/PKGBUILD extra/ndesk-dbus-glib/PKGBUILD extra/xfwm4-themes/PKGBUILD
Diffstat (limited to 'testing/ypbind-mt/nisdomainname.conf')
-rw-r--r--testing/ypbind-mt/nisdomainname.conf4
1 files changed, 0 insertions, 4 deletions
diff --git a/testing/ypbind-mt/nisdomainname.conf b/testing/ypbind-mt/nisdomainname.conf
deleted file mode 100644
index bbbbf8fc7..000000000
--- a/testing/ypbind-mt/nisdomainname.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# NIS domain to be set in /etc/rc.d/ypbind
-#
-NISDOMAINNAME=""