From af0fa308790e6811b96212e9b59163945d14a712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Adolfo=20Mesa=20Rold=C3=A1n?=
 <gustavo.mesa@hidup.io>
Date: Thu, 2 Apr 2020 00:30:43 +0200
Subject: [PATCH] fixed

---
 familyark/app/entrypoint.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/familyark/app/entrypoint.sh b/familyark/app/entrypoint.sh
index bdad1e4..1201d0a 100644
--- a/familyark/app/entrypoint.sh
+++ b/familyark/app/entrypoint.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-<<<<<<< HEAD
 npm i --unsafe-perm
-=======
->>>>>>> d64f7d2a7f505b161de3c0ef05fc9e74e59d978c
 yarn
 node server