From 128a8fe082f2d0f0193f240d36c6e935b5ad4947 Mon Sep 17 00:00:00 2001 From: Vishnu Date: Sat, 7 Mar 2026 10:00:10 +0530 Subject: [PATCH 1/2] Added line in feature branch --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index aa1cace..ca49036 100644 --- a/README.md +++ b/README.md @@ -117,3 +117,4 @@ case 'rtf': ## Roadmap - Remove ignored linting rules and fix them +This line is added in feature branch for merge conflict experiment. From f6e5973cc5ca066b185d6a3833203526dcbbc1c3 Mon Sep 17 00:00:00 2001 From: Vishnu Date: Sat, 7 Mar 2026 10:01:53 +0530 Subject: [PATCH 2/2] Added line in master branch --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index aa1cace..8c574e8 100644 --- a/README.md +++ b/README.md @@ -117,3 +117,6 @@ case 'rtf': ## Roadmap - Remove ignored linting rules and fix them +This line is added in master branch for merge conflict experiment. + +