From e7f3a39be12069a3b5092f813835c83370c261f6 Mon Sep 17 00:00:00 2001
From: Ruben van der Linde <rubenvdlinde@gmail.com>
Date: Tue, 22 Oct 2024 16:07:46 +0200
Subject: [PATCH] Solve merge conflict

---
 appinfo/info.xml | 0
 composer.json    | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 appinfo/info.xml
 mode change 100644 => 100755 composer.json

diff --git a/appinfo/info.xml b/appinfo/info.xml
old mode 100644
new mode 100755
diff --git a/composer.json b/composer.json
old mode 100644
new mode 100755