From 35d33ce165d2585c625414070f0c0bc2518f1b47 Mon Sep 17 00:00:00 2001
From: Johan Andersson <johan.andersson@lime.tech>
Date: Tue, 9 Aug 2022 16:21:16 +0200
Subject: [PATCH 1/2] feat: print current time

---
 index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 635625a..6c44f85 100644
--- a/index.js
+++ b/index.js
@@ -1 +1,2 @@
-console.log("Hello world!");
\ No newline at end of file
+console.log("Hello world!");
+console.log(new Date());

From 3d0709ae4879bc4f65ac2d230e5bb831cff3032c Mon Sep 17 00:00:00 2001
From: Johan Andersson <johan.andersson@lime.tech>
Date: Tue, 9 Aug 2022 16:23:21 +0200
Subject: [PATCH 2/2] docs: add readme and comments

---
 README.md | 13 +++++++++++++
 index.js  |  1 +
 2 files changed, 14 insertions(+)

diff --git a/README.md b/README.md
index 3b5aecb..8ca0ad6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # trainee-release-with-git
 
 This is the trainee course material for the session "Release with Git" which
@@ -40,3 +41,15 @@ begin!
 * [Semantic Release: Release Workflows](https://semantic-release.gitbook.io/semantic-release/recipes/release-workflow)
 * [Git Rebase: Git In Practice](https://www.thinktecture.com/en/tools/demystifying-git-rebase)
 * [Video: VSCode GitLens Interactive Rebase UI](https://www.youtube.com/watch?v=P5p71fguFNI)
+=======
+# Hello world
+
+NodeJS hello world
+
+## How to run
+
+```
+node index.js
+```
+
+>>>>>>> 4f0573d (docs: add readme and comments)
diff --git a/index.js b/index.js
index 6c44f85..ba99050 100644
--- a/index.js
+++ b/index.js
@@ -1,2 +1,3 @@
+// Prints hello world and current time to the user
 console.log("Hello world!");
 console.log(new Date());