From 71ddf14f77360877a92c1e142610dae85640c66c Mon Sep 17 00:00:00 2001
From: Eddy Meals <edimea211@gmail.com>
Date: Tue, 6 Aug 2024 22:09:24 -0700
Subject: [PATCH] Remove stray merge conflict marker

---
 src/common/IpcEventTypes.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/common/IpcEventTypes.ts b/src/common/IpcEventTypes.ts
index 9958749..46d14ff 100644
--- a/src/common/IpcEventTypes.ts
+++ b/src/common/IpcEventTypes.ts
@@ -169,7 +169,6 @@ export type RendererFileControlData =
   | RendererFileControlPromptDownloadData
   | RendererFileControlPromptCreateNewFile
   ;
->>>>>>> 69c0059 (Add docs for everything non-boilerplate)
 /**
  * Data for the renderer-post-console event sent by the main process to add a console message to the
  * AppConsole.