Merge branch 'master' into git-test-three

4 years ago · 1de9726f9f
parent fa80a46d40 b4e4aca7ea
commit 1de9726f9f
1 changed files with 3 additions and 0 deletions
--- a/01_Day_Introduction/01_day_starter/datatypes.js
+++ b/01_Day_Introduction/01_day_starter/datatypes.js
@ -15,4 +15,7 @@ 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 two")
 console.log("git test three with conflict")