Fixed merge conflict

This commit is contained in:
Joe Knapper 2025-06-20 15:14:35 +00:00
commit 9dac080566
31 changed files with 522 additions and 114 deletions

5
.gitignore vendored
View file

@ -90,4 +90,7 @@ openflexure_settings/
/tests/utilities/*.png
# Files created by simulator
openflexure/
openflexure/
# js version file
/webapp/src/version.js