From 2f7d6fd3cb520b9d3022f69ae5ccead8a115cdcb Mon Sep 17 00:00:00 2001 From: Tanmay Date: Tue, 4 Mar 2025 18:51:05 +0530 Subject: [PATCH] updated conflict file --- conflict.html | 1 + 1 file changed, 1 insertion(+) diff --git a/conflict.html b/conflict.html index 183c289..8519934 100644 --- a/conflict.html +++ b/conflict.html @@ -8,5 +8,6 @@

Hello Good Evening All....

Welcome to our new project

+

Hii....welcome to this file

\ No newline at end of file