Merge
This commit is contained in:
11
.idea/workspace.xml
generated
11
.idea/workspace.xml
generated
@@ -7,10 +7,13 @@
|
||||
<list default="true" id="6dcbe3e4-9d68-41d8-8c39-5cfbe5cd4a21" name="Changes" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_rebase__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_rebase__Changes_.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/M5/emensa/models/gerichte_main.php" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/models/gerichte_main.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/M5/emensa/public/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/public/css/style.css" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/M5/Dossier/.$Aufgabe1.drawio.bkp" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/M5/Dossier/.$Aufgabe1.drawio.dtmp" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/M5/Dossier/Aufgabe1.drawio" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/M5/Dossier/ERD M4-1-1.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/M5/emensa/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/routes/web.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/M5/emensa/storage/cache/main.index_b8ca93da07664813b96b9705f586eaa04a44db3c.bladec" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/storage/cache/main.index_b8ca93da07664813b96b9705f586eaa04a44db3c.bladec" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -79,7 +82,7 @@
|
||||
<updated>1700736495450</updated>
|
||||
<workItem from="1700736497007" duration="15223000" />
|
||||
<workItem from="1702027267170" duration="12429000" />
|
||||
<workItem from="1703159060547" duration="1572000" />
|
||||
<workItem from="1703159060547" duration="6344000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
||||
Reference in New Issue
Block a user