From f1b2c5a38f49bb319babf11bf64c420a63e104f2 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Fri, 25 Oct 2024 21:19:19 +0200
Subject: third time's a charm

---
 mwe/events/include/event.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'mwe/events/include/event.h')

diff --git a/mwe/events/include/event.h b/mwe/events/include/event.h
index b1d9cb9..0208085 100644
--- a/mwe/events/include/event.h
+++ b/mwe/events/include/event.h
@@ -5,11 +5,8 @@
 #include <string>
 #include <unordered_map>
 #include <variant>
-<<<<<<< HEAD
 #include "keyCodes.h"
 #include "customTypes.h"
-=======
->>>>>>> b3b762a34e7ccb4a0dcd041a693ac7180af16002
 
 class UUIDGenerator {
 public:
-- 
cgit v1.2.3