From 28255a0cd0c2a6e904e959330f57dfeb129b443a Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 1 Feb 2021 10:20:26 +0100
Subject: [PATCH] save

---
 package-lock.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e71453e96..fad490215 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3072,14 +3072,11 @@
       "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
       "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
     },
-<<<<<<< HEAD
     "@types/date-fns": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/@types/date-fns/-/date-fns-0.0.2.tgz",
       "integrity": "sha1-px0uCyq1e7jegchD5ez24WF3m4w="
     },
-=======
->>>>>>> 662e62a926fd922d43a5b9de69a7aabbcdaee977
     "@types/glob": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",