From 9c301f85aa27d29acac6eaed71b48baf919cc3f0 Mon Sep 17 00:00:00 2001 From: amarselenium Date: Thu, 9 Jul 2026 00:03:15 +0530 Subject: [PATCH 1/4] my 1st changes --- 03_Day_Booleans_operators_date/03_day_starter/scripts/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js b/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js index 77629084e..e7231ee17 100644 --- a/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js +++ b/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js @@ -1 +1 @@ -// this is your main.js script \ No newline at end of file +console.log("my name is Monalisa"); \ No newline at end of file From 1dae6285f9ae04c61e9fbbda9368c2279fd339dd Mon Sep 17 00:00:00 2001 From: amarselenium Date: Thu, 9 Jul 2026 10:22:36 +0530 Subject: [PATCH 2/4] Amaresh first change --- 03_Day_Booleans_operators_date/03_day_starter/scripts/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js b/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js index 77629084e..6e15f55fc 100644 --- a/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js +++ b/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js @@ -1 +1 @@ -// this is your main.js script \ No newline at end of file +console.log("this is my object"); \ No newline at end of file From bf84009bb45600470716549df79f311f082c67cd Mon Sep 17 00:00:00 2001 From: amarselenium Date: Thu, 9 Jul 2026 22:47:39 +0530 Subject: [PATCH 3/4] review addressed --- 03_Day_Booleans_operators_date/03_day_starter/scripts/main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js b/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js index 6e15f55fc..d60d38cb6 100644 --- a/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js +++ b/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js @@ -1 +1,3 @@ -console.log("this is my object"); \ No newline at end of file +console.log("this is my object"); +// addrssed +console.log("this is my addressed file"); \ No newline at end of file From 902ed6c387b17f98765c416c13e0bc63c7e38836 Mon Sep 17 00:00:00 2001 From: amarselenium Date: Thu, 9 Jul 2026 23:02:23 +0530 Subject: [PATCH 4/4] resolving conflicts --- .../03_day_starter/scripts/main.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js b/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js index 44f9ea150..e91558268 100644 --- a/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js +++ b/03_Day_Booleans_operators_date/03_day_starter/scripts/main.js @@ -1,7 +1,5 @@ -<<<<<<< HEAD -console.log("my name is Monalisa"); -======= + console.log("this is my object"); // addrssed console.log("this is my addressed file"); ->>>>>>> a4c0be4c5a2bf3c800ebe75c4ffa4d2fcef74555 +console.log("my name is Monalisa");