fixed merge issue with main

This commit is contained in:
masterElmar
2023-11-01 19:06:54 +01:00
parent 765a18b215
commit b4afd85d5d
24 changed files with 1552 additions and 8 deletions

3
.idea/modules.xml generated
View File

@@ -2,7 +2,8 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/htwk-planner.iml" filepath="$PROJECT_DIR$/.idea/htwk-planner.iml" />
<module fileurl="file://$PROJECT_DIR$/backend/backend.iml" filepath="$PROJECT_DIR$/backend/backend.iml" />
<module fileurl="file://$PROJECT_DIR$/frontend/frontend.iml" filepath="$PROJECT_DIR$/frontend/frontend.iml" />
</modules>
</component>
</project>