merge conflict fixed

This commit is contained in:
Miek Gieben
2016-11-24 21:51:38 +01:00
13 changed files with 158 additions and 13 deletions

View File

@@ -52,6 +52,7 @@ func (a Auto) Walk() error {
}
zo.NoReload = a.loader.noReload
zo.Proxy = a.loader.proxy
zo.TransferTo = a.loader.transferTo
a.Zones.Add(zo, origin)