From b1d1e4269ce51c138346648a64db1241089f803c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bence=20Sz=C3=A9pk=C3=BAti?= <bence.szepkuti@arm.com>
Date: Mon, 17 Jul 2023 19:16:35 +0200
Subject: [PATCH] Introduce deliberate conflict with the base branch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
---
 merge_conflict.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 merge_conflict.txt

diff --git a/merge_conflict.txt b/merge_conflict.txt
new file mode 100644
index 0000000000..e69de29bb2