conflict to be resolved

4 years ago · fa80a46d40
parent 3be884c9b4
commit fa80a46d40
1 changed files with 1 additions and 0 deletions
--- a/01_Day_Introduction/01_day_starter/datatypes.js
+++ b/01_Day_Introduction/01_day_starter/datatypes.js
@ -15,3 +15,4 @@ function logType(variable){console.log(typeof variable)}
 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 three with conflict")