From fa80a46d406fdfbfe1a74d4ddbc01020d15308b8 Mon Sep 17 00:00:00 2001 From: matt vile Date: Mon, 10 May 2021 12:54:24 +0100 Subject: [PATCH] conflict to be resolved --- 01_Day_Introduction/01_day_starter/datatypes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/01_Day_Introduction/01_day_starter/datatypes.js b/01_Day_Introduction/01_day_starter/datatypes.js index 577754b..88fd023 100644 --- 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")