From 44dc67bfefab8a7abc358d9ab40cee762613e5b3 Mon Sep 17 00:00:00 2001
From: Garrone Joseph <joseph.garrone.gj@gmail.com>
Date: Wed, 31 Mar 2021 00:18:03 +0200
Subject: [PATCH] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index f1ae30e..0eb6bbd 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,6 @@ This template automates the boring and tedious tasks of:
 - Publishing on NPM and creating corresponding GitHub releases.
 
 Besides, good stuff that comes with using this template:
-<<<<<<< HEAD
 - The `dist/` directory is not tracked on the ``main`` branch.
 - Shorter specific file import path.  
   ``import {...} from "my_module/theFile"`` instead of the usual