Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.idea/.gitignore
#	.idea/misc.xml
#	.idea/modules.xml
This commit is contained in:
2025-12-07 21:21:21 +01:00
5 changed files with 123 additions and 6 deletions

3
.idea/.gitignore generated vendored
View File

@@ -3,6 +3,3 @@
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

8
.idea/Masterprojekt-Campusnetz.iml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="Python 3.14" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

4
.idea/misc.xml generated
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Black">
<option name="sdkName" value="Python 3.14 (Masterprojekt)" />
<option name="sdkName" value="Python 3.14" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.14 (Masterprojekt)" project-jdk-type="Python SDK" />
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.14" project-jdk-type="Python SDK" />
</project>

2
.idea/modules.xml generated
View File

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