Add sponsor info in funding.yml (HDFGroup#5177)

byrnHDF · Dec 17, 2024 · 2589e57 · 2589e57
1 parent dec5314
commit 2589e57
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,4 +1,8 @@
 # These are supported funding model platforms
 
+<<<<<<< Upstream, based on branch 'develop-doxy-fformat' of https://github.com/byrnHDF/hdf5.git
 github: [hdf5, hsds]
 custom: "https://www.hdfgroup.org/donate"
+=======
+github: hdfgroup
+>>>>>>> 5c8be3a Add sponsor info in funding.yml (#5177)