Resolve merge conflicts

Closes #742
apache · Apr 12, 2016 · 7b0fc64 · 7b0fc64
1 parent 440f531
commit 7b0fc64
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libcloud/dns/providers.py b/libcloud/dns/providers.py
@@ -71,7 +71,8 @@
     ('libcloud.dns.drivers.nsone', 'NsOneDNSDriver'),
     Provider.LUADNS:
     ('libcloud.dns.drivers.luadns', 'LuadnsDNSDriver'),
-
+    Provider.BUDDYNS:
+    ('libcloud.dns.drivers.buddyns', 'BuddyNSDNSDriver'),
 
     # Deprecated
     Provider.RACKSPACE_US: