Merge branch 'master' into develop

alekmaul · Mar 4, 2024 · 39d01ca · 39d01ca
2 parents bcaf066 + 69203c2
commit 39d01ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1 +1 @@
-custom: ['https://www.paypal.com/donate/?hosted_button_id=6K82M5NN8YMMU']
+custom: ['https://www.paypal.com/donate/?hosted_button_id=6K82M5NN8YMMU']
diff --git a/.github/workflows/pvsneslib_build_package.yml b/.github/workflows/pvsneslib_build_package.yml
@@ -59,6 +59,7 @@ jobs:
         if: matrix.name == 'darwin'
         run: |
           brew update
+          rm -f '/usr/local/bin/2to3'
           brew install doxygen
           brew install gnu-sed
           sudo ln -s /usr/local/bin/gcc-12 /usr/local/bin/gcc
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		custom: ['https://www.paypal.com/donate/?hosted_button_id=6K82M5NN8YMMU']
		custom: ['https://www.paypal.com/donate/?hosted_button_id=6K82M5NN8YMMU']