Git pull with conflits

This commit is contained in:
Eudes Inácio
2022-03-27 21:03:49 +01:00
80 changed files with 2615 additions and 1341 deletions
+5 -5
View File
@@ -41,9 +41,9 @@
"@capacitor/camera": "^1.2.0",
"@capacitor/core": "^3.3.2",
"@capacitor/device": "^1.1.0",
"@capacitor/filesystem": "^1.0.6",
"@capacitor/haptics": "^1.1.2",
"@capacitor/ios": "3.3.0",
"@capacitor/filesystem": "^1.1.0",
"@capacitor/haptics": "^1.1.4",
"@capacitor/ios": "3.4.1",
"@capacitor/keyboard": "^1.1.2",
"@capacitor/local-notifications": "^1.1.0",
"@capacitor/network": "^1.0.6",
@@ -66,7 +66,7 @@
"@ionic-native/file": "^5.36.0",
"@ionic-native/file-path": "^5.30.0",
"@ionic-native/fingerprint-aio": "^4.20.0",
"@ionic-native/http": "^5.31.1",
"@ionic-native/http": "^5.36.0",
"@ionic-native/image-picker": "^5.36.0",
"@ionic-native/in-app-browser": "^5.28.0",
"@ionic-native/ionic-webview": "^5.36.0",
@@ -100,6 +100,7 @@
"angular-svg-icon": "^12.0.0",
"angular-tag-cloud-module": "^5.2.2",
"base64-js": "^1.5.1",
"beast-orm": "^1.0.0",
"bootstrap": "^4.5.0",
"build": "0.1.4",
"capacitor-voice-recorder": "^2.0.0",
@@ -138,7 +139,6 @@
"lite-server": "^2.6.1",
"moment": "^2.29.1",
"ng-lazyload-image": "^9.1.2",
"ng2-pdf-viewer": "^3.0.8",
"ngx-cookie-service": "^12.0.3",
"ngx-image-compress": "^11.0.3",
"ngx-image-cropper": "^5.0.1",