Merge branch 'main' of https://github.com/tphakala/go-birdnet

tphakala · Oct 24, 2023 · f41f181 · f41f181
2 parents 9c3f037 + f11be19
commit f41f181
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1 +1,7 @@
-github: tphakala
+<<<<<<< HEAD
+github: tphakala
+=======
+# These are supported funding model platforms
+
+github: tphakala
+>>>>>>> f11be19c5bec5e86a83135ae7051fae25ddb488f