Pre-resolve file conflict

diff --git a/build-scripts/debian-authoritative/config/pdns.local.lua.conf b/build-scripts/debian-authoritative/config/pdns.local.lua.conf
index e2edf4b8b1a1931792ef07d203f90dc9576fde38..529fe519537e26db680060a5b1d1147f6276bb8a 100644 (file)
--- a/build-scripts/debian-authoritative/config/pdns.local.lua.conf
+++ b/build-scripts/debian-authoritative/config/pdns.local.lua.conf
@@ -1,6 +1,6 @@
 # Configuration for the lua backend
 #lua-filename = powerdns-luabackend.lua
-#lua-query-logging = no
+#lua-logging-query = no
 
 # You can also override all the default functionsnames for the luafunctions if you
 # want. The prefix is lua-f_<functionname>=mynewfunction. For example: