fix

4 years ago · 0b8e30313d
parent 9353d98572
commit 0b8e30313d
1 changed files with 0 additions and 6 deletions
--- 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