diff options
Diffstat (limited to 'plugin.cfg')
| -rw-r--r-- | plugin.cfg | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugin.cfg b/plugin.cfg index 4d18c7d4e..34d949253 100644 --- a/plugin.cfg +++ b/plugin.cfg @@ -45,7 +45,11 @@ 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 |