mirror of
https://github.com/coredns/coredns.git
synced 2025-10-27 16:24:19 -04:00
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: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
17
.vscode/launch.json
vendored
17
.vscode/launch.json
vendored
@@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
// 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": []
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user