From bfd4364ba9ec286b934b0a5496c777eae551c0bf Mon Sep 17 00:00:00 2001
From: Jack Zeal <hakfoo@gmail.com>
Date: Tue, 31 Mar 2026 22:29:35 -0700
Subject: [PATCH] Correct blundered merge conflict resolution

---
 src/workspaces.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/workspaces.c b/src/workspaces.c
index ddb6c2bd..0edd1b36 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -25,11 +25,6 @@
 #include "theme.h"
 #include "view.h"
 
-<<<<<<< master
-
-#define COSMIC_WORKSPACES_VERSION 1
-=======
->>>>>>> master
 #define EXT_WORKSPACES_VERSION 1
 
 /* Internal helpers */