conflit resolve

package-lock.json

@@ -3,9 +3,7 @@
   "version": "0.0.1",
   "lockfileVersion": 1,
   "requires": true,
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
+
   "packages": {
     "": {
       "name": "gabinete-digital",
@@ -31969,9 +31967,6 @@
       }
     }
   },
-=======
->>>>>>> b1b28d97e5e154d67ee3e1041a51f1669de00b65
->>>>>>> 839062013b575d399f5309046afd9d240f4b484c
   "dependencies": {
     "@ampproject/remapping": {
       "version": "1.0.1",
@@ -32774,8 +32769,6 @@
       "integrity": "sha512-tk5QlnXfSE2Zu3mJVC3f11Guu5iqnLtNkvvClNHjz/e4FsJEmprfXWCv/QImWs5fLsismHcn31LKYBfWIhOv9g==",
       "requires": {
         "@types/cordova": "^0.0.34"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "@types/cordova": {
@@ -32783,7 +32776,6 @@
           "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
           "integrity": "sha512-rkiiTuf/z2wTd4RxFOb+clE7PF4AEJU0hsczbUdkHHBtkUmpWQpEddynNfJYKYtZFJKbq4F+brfekt1kx85IZA=="
         }
->>>>>>> 839062013b575d399f5309046afd9d240f4b484c
       }
     },
     "@awesome-cordova-plugins/document-viewer": {
@@ -34090,11 +34082,7 @@
       "resolved": "https://registry.npmjs.org/@capacitor-community/camera-preview/-/camera-preview-1.2.1.tgz",
       "integrity": "sha512-rskj/12TR4X8cUzvkWvygf7A/4TFUld9BU5nAc1gc3LXU06FGP0R/6MxZKQdf20qqRaTRLPrF3HFAlkz7xb6yg==",
       "requires": {
-<<<<<<< HEAD
-        "@capacitor/core": "^4.6.1"
-=======
         "@capacitor/core": "^3.6.0"
->>>>>>> 839062013b575d399f5309046afd9d240f4b484c
       },
       "dependencies": {
         "@capacitor/core": {