fix: resolve PR conflicts with origin/main
Some checks failed
Build and Test / build (pull_request) Failing after 4m45s
Some checks failed
Build and Test / build (pull_request) Failing after 4m45s
- Remove .github/FUNDING.yml (upstream FreeCAD only, not Kindred) - Sync .gitignore, .pre-commit-config.yaml, .pylintrc from origin/main - Sync README.md, cMake/FindNETGEN.cmake from origin/main - Sync pixi.lock, pixi.toml from origin/main - Reset mods/ztools submodule pointer to match origin/main
This commit is contained in:
11
.github/FUNDING.yml
vendored
11
.github/FUNDING.yml
vendored
@@ -1,11 +0,0 @@
|
||||
# These are supported funding model platforms
|
||||
|
||||
github: FreeCAD
|
||||
open_collective: freecad
|
||||
patreon: # Replace with a single Patreon username
|
||||
ko_fi: # Replace with a single Ko-fi username
|
||||
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||
issuehunt: # Replace with a single IssueHunt username
|
||||
otechie: # Replace with a single Otechie username
|
||||
custom: ["https://wiki.freecad.org/Donate"]
|
||||
Reference in New Issue
Block a user