From e0706d2dc3c800759e453b07d7924cf34356ae94 Mon Sep 17 00:00:00 2001 From: Ankita Katiyar Date: Mon, 15 Jan 2024 16:13:13 +0000 Subject: [PATCH 1/2] Try creating conflict Signed-off-by: Ankita Katiyar --- test.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.md diff --git a/test.md b/test.md new file mode 100644 index 0000000000..70b40af5cf --- /dev/null +++ b/test.md @@ -0,0 +1 @@ +Hello hello hello \ No newline at end of file From 71af1f956cc29f77949d96b768b94b8c529d4237 Mon Sep 17 00:00:00 2001 From: Ankita Katiyar Date: Mon, 15 Jan 2024 16:18:01 +0000 Subject: [PATCH 2/2] Fix lint Signed-off-by: Ankita Katiyar --- test.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.md b/test.md index 70b40af5cf..dbf45179f6 100644 --- a/test.md +++ b/test.md @@ -1 +1 @@ -Hello hello hello \ No newline at end of file +Hello hello hello