aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2007-02-08 22:48:47 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2007-02-08 22:48:47 +0000
commitd0b2229ebdf2a6569b092d4adf4ad7a984b2ef15 (patch)
tree9486a727b8e1260f7df7e56c9f2dbfa10936f2a4 /configs
parent908810e23f7815eccab97be7023a1aed15f89464 (diff)
merge up to branch 1.2 and re-enable automerge
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@53671 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/dnsmgr.conf.sample2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/dnsmgr.conf.sample b/configs/dnsmgr.conf.sample
index e34dbcf0a..03a376c3e 100644
--- a/configs/dnsmgr.conf.sample
+++ b/configs/dnsmgr.conf.sample
@@ -2,4 +2,4 @@
;enable=yes ; enable creation of managed DNS lookups
; default is 'no'
;refreshinterval=1200 ; refresh managed DNS lookups every <n> seconds
- ; default is 300 (5 minutes) \ No newline at end of file
+ ; default is 300 (5 minutes)