| commit | b1d1e4269ce51c138346648a64db1241089f803c | [log] [tgz] |
|---|---|---|
| author | Bence Szépkúti <bence.szepkuti@arm.com> | Mon Jul 17 19:16:35 2023 +0200 |
| committer | Bence Szépkúti <bence.szepkuti@arm.com> | Wed Jul 19 16:34:56 2023 +0200 |
| tree | b1def82741be6577b4f587882fe0b0aa4354aa27 | |
| parent | 19280ad9b34f9a0d270a9d605cbd4e988cd69fa6 [diff] |
Introduce deliberate conflict with the base branch Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
diff --git a/merge_conflict.txt b/merge_conflict.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/merge_conflict.txt