From 3612334ffcd4d128b2b6e42990013c4a755c75f2 Mon Sep 17 00:00:00 2001
From: juergen <juergen.buechel@stud.fhgr.ch>
Date: Mon, 16 Dec 2024 11:12:37 +0100
Subject: [PATCH 1/2] Merge remote-tracking branch 'origin/master'

---
 .run/StudyPlanner.run.xml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .run/StudyPlanner.run.xml

diff --git a/.run/StudyPlanner.run.xml b/.run/StudyPlanner.run.xml
new file mode 100644
index 0000000..e515743
--- /dev/null
+++ b/.run/StudyPlanner.run.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="StudyPlanner" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" EXPLICIT_BUILD_TARGET_NAME="all">
+    <method v="2">
+      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file

From aee1ab81a9144326ff8af4ffbe3c8576c2523b2b Mon Sep 17 00:00:00 2001
From: juergen <juergen.buechel@stud.fhgr.ch>
Date: Mon, 16 Dec 2024 11:15:02 +0100
Subject: [PATCH 2/2] Merge remote-tracking branch 'origin/master'

---
 .run/StudyPlanner.run.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.run/StudyPlanner.run.xml b/.run/StudyPlanner.run.xml
index e515743..e23b023 100644
--- a/.run/StudyPlanner.run.xml
+++ b/.run/StudyPlanner.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StudyPlanner" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" EXPLICIT_BUILD_TARGET_NAME="all">
+  <configuration default="false" name="StudyPlanner" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" RUN_PATH="$PROJECT_DIR$/Makefile" EXPLICIT_BUILD_TARGET_NAME="all">
     <method v="2">
       <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
     </method>