diff options
| author |  Yong Tang <yong.tang.github@outlook.com>
| 2019-08-17 14:07:23 -0700 |
|---|---|---|
| committer |  Miek Gieben <miek@miek.nl>
| 2019-08-17 21:07:23 +0000 |
| commit | ef7efae761238afeddcef4ea102f4672793b2a61 (patch) | |
| tree | fadf99f32ce739060d1a76b74b16ce6214f99c22 | |
| parent | 194b0f95b459a593deb6c2d1e048e020070a841a (diff) | |
| download | coredns-ef7efae761238afeddcef4ea102f4672793b2a61.tar.gz coredns-ef7efae761238afeddcef4ea102f4672793b2a61.tar.zst coredns-ef7efae761238afeddcef4ea102f4672793b2a61.zip | |
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>
| -rw-r--r-- | .vscode/launch.json | 17 | ||||
| -rw-r--r-- | plugin.cfg | 3 |
2 files changed, 0 insertions, 20 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index c23774cdd..000000000 --- a/.vscode/launch.json +++ /dev/null @@ -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": [] - } - ] -}
\ No newline at end of file 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 |