Merge branch 'main' of https://git.efi.th-nuernberg.de/gitea/heinleinju104093/Functional
# Conflicts: # .idea/misc.xml # .idea/modules.xml
This commit is contained in:
commit
52b094e992
17 files changed
+390
-2
No files matched your search
Generated
-1
@@ -2,7 +2,6 @@
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/Async.iml" filepath="$PROJECT_DIR$/.idea/Async.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
Reference in new issue
Block a user