From 0b8e30313dbd39afe37e92fb5344568e1e654698 Mon Sep 17 00:00:00 2001
From: chenzhihui <zhihui_chen@foxmail.com>
Date: Fri, 19 Feb 2021 12:12:50 +0800
Subject: [PATCH] fix

---
 .github/FUNDING.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index dca571537..f2ca4cb3b 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,8 +1,2 @@
-# These are supported funding model platforms
-<<<<<<< HEAD
 open_collective: go-kratos
 github: [tonybase]
-=======
-
-github: [go-kratos]
->>>>>>> 2a3c35dfcae14605f930b39cb6ab2f96a6fb945c