From 8994cc40d6bd91f0444c26b169245c40179fc220 Mon Sep 17 00:00:00 2001 From: S170H <64917343+S170H@users.noreply.github.com> Date: Wed, 15 Nov 2023 19:09:52 +0100 Subject: [PATCH] M3 2 Update --- .idea/modules.xml | 8 - .idea/vcs.xml | 6 - M1/.idea/.gitignore | 8 - M1/.idea/M1.iml | 8 - M1/.idea/php.xml | 19 -- M2/.idea/.gitignore | 8 - .../shelved.patch | 210 ++++++++++++++++++ ...Checkout_at_15_11_2023_12_24__Changes_.xml | 4 + M2/.idea/workspace.xml | 74 ++++++ {.idea => M3/.idea}/.gitignore | 0 .idea/DBWT-Praktika.iml => M3/.idea/M3.iml | 0 M3/.idea/dataSources.xml | 12 + {M1 => M3}/.idea/modules.xml | 2 +- {.idea => M3/.idea}/php.xml | 0 M3/.idea/sqldialects.xml | 7 + {M1 => M3}/.idea/vcs.xml | 0 M3/M3.pdf | Bin 0 -> 177347 bytes M3/werbeseite_daten.sql | 93 ++++++++ 18 files changed, 401 insertions(+), 58 deletions(-) delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 M1/.idea/.gitignore delete mode 100644 M1/.idea/M1.iml delete mode 100644 M1/.idea/php.xml delete mode 100644 M2/.idea/.gitignore create mode 100644 M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]/shelved.patch create mode 100644 M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24__Changes_.xml create mode 100644 M2/.idea/workspace.xml rename {.idea => M3/.idea}/.gitignore (100%) rename .idea/DBWT-Praktika.iml => M3/.idea/M3.iml (100%) create mode 100644 M3/.idea/dataSources.xml rename {M1 => M3}/.idea/modules.xml (61%) rename {.idea => M3/.idea}/php.xml (100%) create mode 100644 M3/.idea/sqldialects.xml rename {M1 => M3}/.idea/vcs.xml (100%) create mode 100644 M3/M3.pdf create mode 100644 M3/werbeseite_daten.sql diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 20be1f8..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/M1/.idea/.gitignore b/M1/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/M1/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/M1/.idea/M1.iml b/M1/.idea/M1.iml deleted file mode 100644 index c956989..0000000 --- a/M1/.idea/M1.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/M1/.idea/php.xml b/M1/.idea/php.xml deleted file mode 100644 index f324872..0000000 --- a/M1/.idea/php.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/M2/.idea/.gitignore b/M2/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/M2/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]/shelved.patch b/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]/shelved.patch new file mode 100644 index 0000000..58aeb50 --- /dev/null +++ b/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]/shelved.patch @@ -0,0 +1,210 @@ +Index: ../M1/.idea/vcs.xml +=================================================================== +diff --git a/../M1/.idea/vcs.xml b/../M1/.idea/vcs.xml +deleted file mode 100644 +--- a/../M1/.idea/vcs.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) +@@ -1,6 +0,0 @@ +- +- +- +- +- +- +\ No newline at end of file +Index: ../M1/.idea/.gitignore +=================================================================== +diff --git a/../M1/.idea/.gitignore b/../M1/.idea/.gitignore +deleted file mode 100644 +--- a/../M1/.idea/.gitignore (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) +@@ -1,8 +0,0 @@ +-# Default ignored files +-/shelf/ +-/workspace.xml +-# Editor-based HTTP Client requests +-/httpRequests/ +-# Datasource local storage ignored files +-/dataSources/ +-/dataSources.local.xml +Index: ../.idea/modules.xml +=================================================================== +diff --git a/../.idea/modules.xml b/../.idea/modules.xml +deleted file mode 100644 +--- a/../.idea/modules.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) +@@ -1,8 +0,0 @@ +- +- +- +- +- +- +- +- +\ No newline at end of file +Index: ../M1/.idea/M1.iml +=================================================================== +diff --git a/../M1/.idea/M1.iml b/../M1/.idea/M1.iml +deleted file mode 100644 +--- a/../M1/.idea/M1.iml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) +@@ -1,8 +0,0 @@ +- +- +- +- +- +- +- +- +\ No newline at end of file +Index: ../.idea/php.xml +=================================================================== +diff --git a/../.idea/php.xml b/../.idea/php.xml +deleted file mode 100644 +--- a/../.idea/php.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) +@@ -1,20 +0,0 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +- +\ No newline at end of file +Index: ../.idea/DBWT-Praktika.iml +=================================================================== +diff --git a/../.idea/DBWT-Praktika.iml b/../.idea/DBWT-Praktika.iml +deleted file mode 100644 +--- a/../.idea/DBWT-Praktika.iml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) +@@ -1,8 +0,0 @@ +- +- +- +- +- +- +- +- +\ No newline at end of file +Index: ../M1/.idea/php.xml +=================================================================== +diff --git a/../M1/.idea/php.xml b/../M1/.idea/php.xml +deleted file mode 100644 +--- a/../M1/.idea/php.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) +@@ -1,19 +0,0 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +\ No newline at end of file +Index: ../.idea/.gitignore +=================================================================== +diff --git a/../.idea/.gitignore b/../.idea/.gitignore +deleted file mode 100644 +--- a/../.idea/.gitignore (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) +@@ -1,8 +0,0 @@ +-# Default ignored files +-/shelf/ +-/workspace.xml +-# Editor-based HTTP Client requests +-/httpRequests/ +-# Datasource local storage ignored files +-/dataSources/ +-/dataSources.local.xml +Index: .idea/.gitignore +=================================================================== +diff --git a/.idea/.gitignore b/.idea/.gitignore +deleted file mode 100644 +--- a/.idea/.gitignore (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) +@@ -1,8 +0,0 @@ +-# Default ignored files +-/shelf/ +-/workspace.xml +-# Editor-based HTTP Client requests +-/httpRequests/ +-# Datasource local storage ignored files +-/dataSources/ +-/dataSources.local.xml +Index: ../M1/.idea/modules.xml +=================================================================== +diff --git a/../M1/.idea/modules.xml b/../M1/.idea/modules.xml +deleted file mode 100644 +--- a/../M1/.idea/modules.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) +@@ -1,8 +0,0 @@ +- +- +- +- +- +- +- +- +\ No newline at end of file +Index: ../.idea/vcs.xml +=================================================================== +diff --git a/../.idea/vcs.xml b/../.idea/vcs.xml +deleted file mode 100644 +--- a/../.idea/vcs.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ /dev/null (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) +@@ -1,6 +0,0 @@ +- +- +- +- +- +- +\ No newline at end of file +Index: .idea/php.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/php.xml b/.idea/php.xml +--- a/.idea/php.xml (revision 1b5faa0d69e292e2649269e271b773eaad28f5d1) ++++ b/.idea/php.xml (date 1700047317911) +@@ -10,7 +10,6 @@ +