From 7b63beee49b3745b6ea29620276dae809de5fe6d Mon Sep 17 00:00:00 2001 From: Abdelhady Nimrawi Date: Sat, 20 Dec 2025 22:05:12 +0300 Subject: [PATCH 1/2] Test git merge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0963e38..eabf80d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-github-training Can you see these new edits? +hello \ No newline at end of file From d91b8bd4c92cdabb6487c8d4893a6b328dcd009f Mon Sep 17 00:00:00 2001 From: Abdelhady Nimrawi Date: Mon, 22 Dec 2025 20:45:38 +0300 Subject: [PATCH 2/2] Make some changes --- README.md | 2 +- index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eabf80d..a90d621 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-github-training Can you see these new edits? -hello \ No newline at end of file +hello world \ No newline at end of file diff --git a/index.html b/index.html index a421355..61b9dab 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,7 @@ - +

Hello this is the first paragraph

\ No newline at end of file