From 5fd60766df6df6a30a37fcbd332b5e585fd2b0f2 Mon Sep 17 00:00:00 2001 From: quanBong <126080153+quanBong@users.noreply.github.com> Date: Thu, 18 Jul 2024 19:32:39 +0800 Subject: [PATCH 1/2] create conflict 2.0 --- HomePage.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HomePage.html b/HomePage.html index c8e13eb..cd55115 100644 --- a/HomePage.html +++ b/HomePage.html @@ -2,5 +2,7 @@

This is P5

+

I dont know how to do this

+

and i hope this can make the conflict

From bba3f8527cab86345b51a14ddd97243309708eeb Mon Sep 17 00:00:00 2001 From: quanBong Date: Mon, 22 Jul 2024 11:36:57 +0800 Subject: [PATCH 2/2] update the readme file --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5caa285..754be87 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# group5 \ No newline at end of file +# group5 + +# here again the hello world \ No newline at end of file