From 0ef152c83c7940e1416402f8f23027be5222bc37 Mon Sep 17 00:00:00 2001 From: v1mbi Date: Mon, 1 Jun 2026 17:28:28 +0100 Subject: [PATCH 1/3] changeed to hy --- Conflict.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Conflict.txt b/Conflict.txt index e11f06c..7dc0949 100644 --- a/Conflict.txt +++ b/Conflict.txt @@ -1,2 +1,2 @@ -hello! +hyy Im a conflict \ No newline at end of file From 1d3144d3d4b08391ad3094eeb6ab27c2d8c4fc5d Mon Sep 17 00:00:00 2001 From: v1mbi Date: Mon, 1 Jun 2026 17:30:04 +0100 Subject: [PATCH 2/3] changed it to hyyy --- Conflict.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Conflict.txt b/Conflict.txt index 7dc0949..7020d4f 100644 --- a/Conflict.txt +++ b/Conflict.txt @@ -1,2 +1,2 @@ -hyy +hyyy Im a conflict \ No newline at end of file From 2d5c2cb6afc9b111f7a6f355fceafcc9bd27a1b7 Mon Sep 17 00:00:00 2001 From: v1mbi Date: Mon, 1 Jun 2026 17:32:55 +0100 Subject: [PATCH 3/3] v1 --- Conflict.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Conflict.txt b/Conflict.txt index 7020d4f..4613c0f 100644 --- a/Conflict.txt +++ b/Conflict.txt @@ -1,2 +1,2 @@ -hyyy +hyyyy Im a conflict \ No newline at end of file