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.