From c2c37450b3bedea5ba4c3b835ae7bc18377ec57a Mon Sep 17 00:00:00 2001
From: Alessio Molinari <alessiomolinar@gmail.com>
Date: Wed, 12 Jun 2024 23:33:57 +0200
Subject: [PATCH 1/3] chore(readme): remove git merge stuff

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 25ed745..a9c9f3b 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,6 @@ This plugin **DOES NOT** support `hyprland-git`, please refrain from opening iss
 
 Feel free to join our [matrix room](https://matrix.to/#/#hypr-virtual-desktops:matrix.org)!
 
->>>>>>> main
-
 ## Table of contents
 - [Virtual desktops for Hyprland ](#virtual-desktops-for-hyprland-)
   - [Table of contents](#table-of-contents)

From d6c6deac5561c13788118df768d4b6e21fc7d949 Mon Sep 17 00:00:00 2001
From: WhySoBad <49595640+WhySoBad@users.noreply.github.com>
Date: Sat, 22 Jun 2024 11:44:43 +0200
Subject: [PATCH 2/3] fix: removed shared pointer reference

---
 include/VirtualDesk.hpp | 1 -
 include/utils.hpp       | 1 -
 src/main.cpp            | 1 -
 3 files changed, 3 deletions(-)

diff --git a/include/VirtualDesk.hpp b/include/VirtualDesk.hpp
index 4bd1263..57a4a19 100644
--- a/include/VirtualDesk.hpp
+++ b/include/VirtualDesk.hpp
@@ -11,7 +11,6 @@
 #include "globals.hpp"
 #include "utils.hpp"
 #include <hyprland/src/Compositor.hpp>
-#include <hyprland/src/helpers/memory/SharedPtr.hpp>
 
 typedef std::unordered_map<int, int>             WorkspaceMap;
 // map with CMonitor* -> hyprland workspace id
diff --git a/include/utils.hpp b/include/utils.hpp
index bf2c720..b1dba70 100644
--- a/include/utils.hpp
+++ b/include/utils.hpp
@@ -5,7 +5,6 @@
 #include <hyprland/src/debug/Log.hpp>
 #include "globals.hpp"
 #include <hyprland/src/config/ConfigManager.hpp>
-#include <hyprland/src/helpers/memory/SharedPtr.hpp>
 #include <string>
 #include <hyprland/src/Compositor.hpp>
 
diff --git a/src/main.cpp b/src/main.cpp
index 2d0be9d..877629a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,7 +5,6 @@
 #include <hyprland/src/desktop/Workspace.hpp>
 #include <hyprland/src/debug/Log.hpp>
 #include <hyprland/src/events/Events.hpp>
-#include <hyprland/src/helpers/memory/SharedPtr.hpp>
 
 #include "globals.hpp"
 #include "VirtualDeskManager.hpp"

From 726135125c7e5debc147cec8001778d64e293244 Mon Sep 17 00:00:00 2001
From: WhySoBad <49595640+WhySoBad@users.noreply.github.com>
Date: Mon, 24 Jun 2024 21:01:43 +0200
Subject: [PATCH 3/3] fix: add hyprutils to CI

---
 .github/actions/setup_base/action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/setup_base/action.yml b/.github/actions/setup_base/action.yml
index 8f8df38..e05d3d0 100644
--- a/.github/actions/setup_base/action.yml
+++ b/.github/actions/setup_base/action.yml
@@ -35,6 +35,7 @@ runs:
           go \
           hyprlang \
           hyprcursor \
+          hyprutils \
           jq \
           libc++ \
           libdisplay-info \