Merge branch 'main' of github.com:go-kratos/kratos into main

4 years ago · 9353d98572
parent 141db56a54 2a3c35dfca
commit 9353d98572
1 changed files with 5 additions and 0 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,3 +1,8 @@
 # These are supported funding model platforms
+<<<<<<< HEAD
 open_collective: go-kratos
 github: [tonybase]
+=======
+
+github: [go-kratos]
+>>>>>>> 2a3c35dfcae14605f930b39cb6ab2f96a6fb945c