From 41d1750456bcc7f89cabf77026e084dbd89d6087 Mon Sep 17 00:00:00 2001 From: Gayatri-512 Date: Wed, 26 Mar 2025 16:51:36 +0530 Subject: [PATCH 1/4] added contribution.txt with my lines --- contribution.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 contribution.txt diff --git a/contribution.txt b/contribution.txt new file mode 100644 index 0000000..b5d9872 --- /dev/null +++ b/contribution.txt @@ -0,0 +1 @@ +Gayatri- This is a new line From b44dbcec3b694dd7d687c529ca71fe04279df2c2 Mon Sep 17 00:00:00 2001 From: Gayatri-512 Date: Wed, 26 Mar 2025 17:07:39 +0530 Subject: [PATCH 2/4] i added .gitignore and README.md file --- .gitignore | 3 ++- README.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 README.md diff --git a/.gitignore b/.gitignore index c2658d7..328214b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -node_modules/ +*.log +temp/ diff --git a/README.md b/README.md new file mode 100644 index 0000000..269d925 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +#Dance Website edited by me. this is a new update From a7d14d2c108e3a541dbd5427889832d0f3218ccc Mon Sep 17 00:00:00 2001 From: Gayatri-512 Date: Wed, 26 Mar 2025 17:20:53 +0530 Subject: [PATCH 3/4] Updated README.md in master --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 269d925..11f45e5 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -#Dance Website edited by me. this is a new update +This is the main branch version. From a293aa1d28b550f112d13c8f78aae53cdb64c8a2 Mon Sep 17 00:00:00 2001 From: Gayatri-512 Date: Wed, 26 Mar 2025 17:22:09 +0530 Subject: [PATCH 4/4] Updated README.md in conflict-demo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 269d925..93ec594 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -#Dance Website edited by me. this is a new update +This is the conflict-demo version.