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:
@@ -46,7 +46,6 @@ exclude: |
|
||||
src/App/ExpressionParser.tab.h|
|
||||
src/App/ExpressionParser.y|
|
||||
src/App/lex.ExpressionParser.c|
|
||||
src/Doc/ThirdPartyLibraries.html.cmake|
|
||||
src/Gui/3Dconnexion/navlib|
|
||||
src/Gui/QSint|
|
||||
src/Gui/Quarter|
|
||||
|
||||
Reference in New Issue
Block a user