Merge branch 'feature/flet-frontend' of github.com:Deltares-research/… · Deltares-research/PathwaysGenerator@164cd67 · GitHub

Commit

Merge branch 'feature/flet-frontend' of github.com:Deltares-research/…

Browse files

…PathwaysGenerator into feature/flet-frontend

# Conflicts:
#	pyproject.toml
#	source/package/pathways_app/controls/header.py
#	source/package/pathways_app/controls/panel.py
#	source/package/pathways_app/controls/tabbed_panel.py
#	source/package/pathways_app/main.py
#	source/package/pathways_app/theme.py

Loading branch information

ajkolenc committed Dec 14, 2024

2 parents 8ec1b6d + e798f97 commit 164cd67