From 8b0f9e22a8a66d147eaee87332de90f3000a0c4d Mon Sep 17 00:00:00 2001 From: fdekeers <francois.dekeersmaeker@student.uclouvain.be> Date: Thu, 22 Jul 2021 14:39:00 +0200 Subject: [PATCH] Test merge conflict --- branch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/branch.txt b/branch.txt index 453ed87..c3a07ad 100644 --- a/branch.txt +++ b/branch.txt @@ -1 +1 @@ -Test branch +Test branch \ No newline at end of file -- GitLab