lars/Projekttage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of C:\Users\wurstda\PycharmProjects\Projekttage with conflicts.

Browse Source
This commit is contained in:
dxnso
2019-07-23 10:03:57 +02:00
parent 7961d3dc22
commit dcff3aeabd
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+1 -1
View File
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Projekttage1.iml" filepath="$PROJECT_DIR$/.idea/Projekttage1.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/Projekttage.iml" filepath="$PROJECT_DIR$/.idea/Projekttage.iml" />
</modules>
</component>
</project>