From 4e0f034891abafd57a8dcc5bb87008ebd9371ac2 Mon Sep 17 00:00:00 2001
From: warmCabin <ryanwb2@gmail.com>
Date: Tue, 29 Jun 2021 07:37:04 -0400
Subject: [PATCH] janky merge conflict dodge

---
 src/drivers/win/res.rc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index 18dd4bce..44289b61 100644
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@@ -2339,6 +2339,11 @@ BEGIN
     0
 END
 
+ARCHIVECHOOSERDIALOG AFX_DIALOG_LAYOUT
+BEGIN
+	0
+END
+
 CODEDUMPER AFX_DIALOG_LAYOUT
 BEGIN
     0