Just our luck on the merge conflict there

Author: Ronald van Zantvoort

systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py

@@ -81,24 +81,12 @@ def use_extdns(self):
     def get_dns(self):
         conf = self.cmdline().idata()
         dns = []
-<<<<<<< e09480728f4ed77d0bd0bdc6a6c0966d90f7ee26
-        if not self.cl.get_use_ext_dns():
-            if not self.is_vpc() and self.cl.is_redundant():
-                dns.append(self.cl.get_guest_gw())
-            else:
-                dns.append(self.address().get_guest_ip())
-        names = ["dns1", "dns2"]
-        for name in names:
-            if name in self.cmdline().idata():
-                dns.append(self.cmdline().idata()[name])
-=======
         if not self.use_extdns():
             dns.append(self.address().get_guest_ip())
 
         for name in ('dns1', 'dns2'):
             if name in conf:
                 dns.append(conf[name])
->>>>>>> Virtual Router fixes:
         return dns
 
     def get_format(self):