From f65269711eaac46fdcb2afc9134f89a97cb631d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20GAUTREAU?= <Jeff59550@gmail.com>
Date: Tue, 1 Dec 2020 14:53:24 +0100
Subject: [PATCH] :bug: : fix procFile

---
 procfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/procfile b/procfile
index d5888b3..7832b05 100644
--- a/procfile
+++ b/procfile
@@ -1,5 +1 @@
-<<<<<<< HEAD
-node:yarn start 
-=======
 node:yarn start
->>>>>>> 253463c2f8a6348609ea2bc6cf2992c3e2125f41