From 1a6a82ba8ee045f1f0bc33b67cd049c7353aaf00 Mon Sep 17 00:00:00 2001
From: jasio <54361578+jaasio@users.noreply.github.com>
Date: Tue, 28 Jun 2022 20:15:59 +0200
Subject: [PATCH 1/2] Update README.md

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index b1e441a..2d8cc94 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,12 @@
+<<<<<<< Updated upstream
 # Jade GUI
+=======
+<p align="center">
+  <a href="https://github.com/crystal-linux/todo/">
+    <img src="https://getcryst.al/site/assets/other/logo.png" alt="Logo" width="150" height="150">
+  </a>
+</p>
+>>>>>>> Stashed changes
 
 The flutter-based gui installer using jade as the backend
 

From a39ded66ea6f7428b42b2cdd4bc167d310f000d1 Mon Sep 17 00:00:00 2001
From: axtloss <axtlos@tar.black>
Date: Sun, 3 Jul 2022 11:41:05 +0200
Subject: [PATCH 2/2] Update install.dart

---
 lib/functions/install.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/functions/install.dart b/lib/functions/install.dart
index 87f3923..9a21321 100644
--- a/lib/functions/install.dart
+++ b/lib/functions/install.dart
@@ -10,8 +10,8 @@ test(setOutput, running, setRunning, config, writeToLog) async {
     const filename = "/tmp/jade.json";
     await File(filename).writeAsString(config);
     writeToLog("Json config: $config");
-    //var process = await Process.start('pkexec', ['jade', 'config', filename]);
-    var process = await Process.start('/opt/jade_gui/scripts/jadeemu.sh', []);
+    var process = await Process.start('pkexec', ['jade', 'config', filename]);
+    //var process = await Process.start('/opt/jade_gui/scripts/jadeemu.sh', []);
     process.stdout.transform(utf8.decoder).forEach(setOutput);
     setRunning(true);
   }