Commit ef7efae7 authored by Yong Tang's avatar Yong Tang Committed by Miek Gieben

Remove merge left overs (#3136)

Looks like there were some leftover in PR 3011 during
the merge conflict rebase. This PR removes the unneeded file
and fixed the plugin.cfg
Signed-off-by: default avatarYong Tang <yong.tang.github@outlook.com>
parent 194b0f95
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Launch",
"type": "go",
"request": "launch",
"mode": "auto",
"program": "${fileDirname}",
"env": {},
"args": []
}
]
}
\ No newline at end of file
...@@ -45,11 +45,8 @@ autopath:autopath ...@@ -45,11 +45,8 @@ autopath:autopath
template:template template:template
hosts:hosts hosts:hosts
route53:route53 route53:route53
<<<<<<< 6a6e9a9b33731656b51655072951649d9e716613
azure:azure azure:azure
=======
clouddns:clouddns clouddns:clouddns
>>>>>>> Add Google Cloud DNS plugin
federation:federation federation:federation
k8s_external:k8s_external k8s_external:k8s_external
kubernetes:kubernetes kubernetes:kubernetes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment