diff --git a/01_Day_Introduction/01_day_starter/datatypes.js b/01_Day_Introduction/01_day_starter/datatypes.js index b6b63a1..a78fbfa 100644 --- a/01_Day_Introduction/01_day_starter/datatypes.js +++ b/01_Day_Introduction/01_day_starter/datatypes.js @@ -16,3 +16,6 @@ console.log(`${firstName} is ${myAge} years old`) console.log(`${yourName} is ${yourAge} years old, what an oldie!`) console.log("git test") console.log("git test two") +console.log("git test three with conflict") + +