Fixed merge conflict
This commit is contained in:
commit
9dac080566
31 changed files with 522 additions and 114 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -90,4 +90,7 @@ openflexure_settings/
|
|||
/tests/utilities/*.png
|
||||
|
||||
# Files created by simulator
|
||||
openflexure/
|
||||
openflexure/
|
||||
|
||||
# js version file
|
||||
/webapp/src/version.js
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue