Merge pull request #2 from Elgonzo422/git-test-three

conflict to be resolved
4 years ago · 646b1b08f5
parent b4e4aca7ea 1de9726f9f
commit 646b1b08f5
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
@ -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")
+
+