From 760566acb9407c03ce65e70a78db4ba581f9f92b Mon Sep 17 00:00:00 2001
From: David Refoua <David@Refoua.me>
Date: Mon, 12 Sep 2022 22:33:52 +0430
Subject: [PATCH] resolve conflicts

---
 launcher/src/strings.rc2 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 launcher/src/strings.rc2

diff --git a/launcher/src/strings.rc2 b/launcher/src/strings.rc2
old mode 100755
new mode 100644