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

9
backend/.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="ProjectType">
<option name="id" value="jpab" />
</component>
</project>