diff options
Diffstat (limited to 'mwe/events/include/event.h')
| -rw-r--r-- | mwe/events/include/event.h | 3 |
1 files changed, 0 insertions, 3 deletions
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: |