diff options
Diffstat (limited to 'plugin.cfg')
| -rw-r--r-- | plugin.cfg | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/plugin.cfg b/plugin.cfg index 34d949253..be9447534 100644 --- a/plugin.cfg +++ b/plugin.cfg @@ -45,11 +45,8 @@ autopath:autopath template:template hosts:hosts route53:route53 -<<<<<<< 6a6e9a9b33731656b51655072951649d9e716613 azure:azure -======= clouddns:clouddns ->>>>>>> Add Google Cloud DNS plugin federation:federation k8s_external:k8s_external kubernetes:kubernetes |