resolving conflict

3 weeks ago · d645a87b32
parent 9c301f85aa a4c0be4c5a
commit d645a87b32
1 changed files with 7 additions and 1 deletions
--- 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,7 @@
-console.log("my name is Monalisa");
+<<<<<<< HEAD
+console.log("my name is Monalisa");
+=======
+console.log("this is my object");
+// addrssed
+console.log("this is my addressed file");
+>>>>>>> a4c0be4c5a2bf3c800ebe75c4ffa4d2fcef74555