From 14aa8679b76f37d5cb05f4d13c42f9c78d1460f0 Mon Sep 17 00:00:00 2001 From: Mykhailo Chaban <chabamuk@cvut.cz> Date: Sun, 29 Sep 2024 15:33:51 +0200 Subject: [PATCH] feat: file is updated for future merge conflicts --- practice_file.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/practice_file.txt b/practice_file.txt index 16b90c5..90ad96e 100644 --- a/practice_file.txt +++ b/practice_file.txt @@ -1 +1 @@ -The file has to be updated with no conflicts. +The file is updated to create conflicts in the future. \ No newline at end of file -- GitLab