diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-07 09:16:08 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-07 09:16:08 +0200 |
| commit | 44d5db78dfc2e2180898d8db13822e339665b7a3 (patch) | |
| tree | 5a8ad6d447af343e4d43eb96a918e9f566460351 /testing/bind/named.conf.d | |
| parent | c46eba9943dd0e63496ab3ee93cfb7da246386c9 (diff) | |
| parent | 334c2a7916a80d08b1c216cfbf02135e64891632 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/nbd/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
kde-unstable/libkcompactdisc/PKGBUILD
Diffstat (limited to 'testing/bind/named.conf.d')
| -rw-r--r-- | testing/bind/named.conf.d | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d deleted file mode 100644 index aecbd2307..000000000 --- a/testing/bind/named.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to BIND -# -NAMED_ARGS="-u named" |