Removed rejected merge file
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/5bd94a12 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5bd94a12 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5bd94a12 Branch: refs/heads/trunk Commit: 5bd94a1230062fda73dbedf65eb28a3b1216d294 Parents: 477f222 Author: anthony-shaw <anthonys...@apache.org> Authored: Wed Apr 13 22:15:28 2016 +1000 Committer: anthony-shaw <anthonys...@apache.org> Committed: Wed Apr 13 22:15:28 2016 +1000 ---------------------------------------------------------------------- libcloud/dns/types.py.rej | 46 ------------------------------------------ 1 file changed, 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/5bd94a12/libcloud/dns/types.py.rej ---------------------------------------------------------------------- diff --git a/libcloud/dns/types.py.rej b/libcloud/dns/types.py.rej deleted file mode 100644 index 246c69d..0000000 --- a/libcloud/dns/types.py.rej +++ /dev/null @@ -1,46 +0,0 @@ -diff a/libcloud/dns/types.py b/libcloud/dns/types.py (rejected hunks) -@@ -31,28 +31,28 @@ - - class Provider(object): - DUMMY = 'dummy' -- LINODE = 'linode' -- RACKSPACE = 'rackspace' -- ZERIGO = 'zerigo' -- ROUTE53 = 'route53' -- HOSTVIRTUAL = 'hostvirtual' -- GANDI = 'gandi' -- GOOGLE = 'google' -- SOFTLAYER = 'softlayer' -- DIGITAL_OCEAN = 'digitalocean' - AURORADNS = 'auroradns' -- WORLDWIDEDNS = 'worldwidedns' -+ CLOUDFLARE = 'cloudflare' -+ DIGITAL_OCEAN = 'digitalocean' - DNSIMPLE = 'dnsimple' -- POINTDNS = 'pointdns' -- VULTR = 'vultr' -- LIQUIDWEB = 'liquidweb' -- ZONOMI = 'zonomi' - DURABLEDNS = 'durabledns' -+ GANDI = 'gandi' - GODADDY = 'godaddy' -- CLOUDFLARE = 'cloudflare' -- NSONE = 'nsone' -+ GOOGLE = 'google' -+ HOSTVIRTUAL = 'hostvirtual' -+ LINODE = 'linode' -+ LIQUIDWEB = 'liquidweb' - LUADNS = 'luadns' - NFSN = 'nfsn' -+ NSONE = 'nsone' -+ POINTDNS = 'pointdns' -+ RACKSPACE = 'rackspace' -+ ROUTE53 = 'route53' -+ SOFTLAYER = 'softlayer' -+ VULTR = 'vultr' -+ WORLDWIDEDNS = 'worldwidedns' -+ ZERIGO = 'zerigo' -+ ZONOMI = 'zonomi' - # Deprecated - RACKSPACE_US = 'rackspace_us' - RACKSPACE_UK = 'rackspace_uk'
