From 0ea86802620945350b77b673e8a4da5bda4fc59a Mon Sep 17 00:00:00 2001
From: Aaron <57018940+0dm@users.noreply.github.com>
Date: Fri, 26 Aug 2022 03:51:13 -0400
Subject: [PATCH] Update main.h

---
 src/exe/main.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/exe/main.h b/src/exe/main.h
index b3a37db..58a555a 100644
--- a/src/exe/main.h
+++ b/src/exe/main.h
@@ -6,12 +6,8 @@
 #define MATCH(s, n) strcmp(section, s) == 0 && strcmp(name, n) == 0
 
 char useDebug = TRUE;
-<<<<<<< Updated upstream
-DWORD64 SprjFlipper = 0x14489DD20;
-=======
 DWORD64 SprjFlipper;
 
->>>>>>> Stashed changes
 RECT final;
 
 NTSYSAPI NTSTATUS NTAPI NtReadVirtualMemory(HANDLE ProcessHandle, void *BaseAddress, const void *Buffer,