From ef7efae761238afeddcef4ea102f4672793b2a61 Mon Sep 17 00:00:00 2001
From: Yong Tang <yong.tang.github@outlook.com>
Date: Sat, 17 Aug 2019 14:07:23 -0700
Subject: [PATCH] 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>
---
 .vscode/launch.json | 17 -----------------
 plugin.cfg          |  3 ---
 2 files changed, 20 deletions(-)
 delete mode 100644 .vscode/launch.json

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