Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-26 15:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge left overs (#3136)

Browse Source 
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:
Yong Tang
2019-08-17 14:07:23 -07:00
committed by Miek Gieben
parent 194b0f95b4
commit ef7efae761
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugin.cfg
View File

@@ -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