From d3fc2331751b5b9ef506d0db9eb53ad1b0543905 Mon Sep 17 00:00:00 2001
From: TorreiroW <githubwto@toorren.net>
Date: Thu, 10 Oct 2024 13:34:18 +0200
Subject: [PATCH 1/2] fix copy clipboard functionality

---
 rbw-menu.sh | 12 ++++++++++++
 todo.txt    |  7 +++++++
 2 files changed, 19 insertions(+)
 create mode 100644 todo.txt

diff --git a/rbw-menu.sh b/rbw-menu.sh
index 72f5cef..d05106c 100755
--- a/rbw-menu.sh
+++ b/rbw-menu.sh
@@ -44,6 +44,11 @@ check_variables itemType itemQuery
 
 
 
+<<<<<<< HEAD
+=======
+#clipboardEditor="pbcopy"
+clipboardEditor="xclip"
+>>>>>>> 3250374 (fix copy clipboard functionality)
 
 set -eu
 
@@ -88,4 +93,11 @@ code)
 	;;
 esac
 
+<<<<<<< HEAD
 echo ${rbwOutput}
+=======
+if [[ ! -z ${clipboardEditor} ]]; then
+  echo ${rbwOutput} | ${clipboardEditor} #$(which ${clipboardEditor})
+fi
+  echo ${rbwOutput}
+>>>>>>> 3250374 (fix copy clipboard functionality)
diff --git a/todo.txt b/todo.txt
new file mode 100644
index 0000000..f19960e
--- /dev/null
+++ b/todo.txt
@@ -0,0 +1,7 @@
+[ ] niet aws tools verwijderen
+[ ] md tutorials in documentatie folder
+[ ] organiseren scripts in mappen (docs)
+[ ] licentie (apache)
+[ ] change-log bestand toevoegen
+[ ] overzicht in readme (install beschrijving)
+

From bcb3f2d6c2d58fd30a0f05b43f263c7a5de9bd67 Mon Sep 17 00:00:00 2001
From: TorreiroW <githubwto@toorren.net>
Date: Thu, 10 Oct 2024 13:36:25 +0200
Subject: [PATCH 2/2] fix merge conflicts

---
 rbw-menu.sh | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/rbw-menu.sh b/rbw-menu.sh
index d05106c..73c6647 100755
--- a/rbw-menu.sh
+++ b/rbw-menu.sh
@@ -44,12 +44,6 @@ check_variables itemType itemQuery
 
 
 
-<<<<<<< HEAD
-=======
-#clipboardEditor="pbcopy"
-clipboardEditor="xclip"
->>>>>>> 3250374 (fix copy clipboard functionality)
-
 set -eu
 
 #itemType="$1"
@@ -93,11 +87,8 @@ code)
 	;;
 esac
 
-<<<<<<< HEAD
-echo ${rbwOutput}
-=======
 if [[ ! -z ${clipboardEditor} ]]; then
   echo ${rbwOutput} | ${clipboardEditor} #$(which ${clipboardEditor})
 fi
   echo ${rbwOutput}
->>>>>>> 3250374 (fix copy clipboard functionality)
+