Resolve merge conflict

yannivain · Mar 28, 2022 · 99c9c11 · 99c9c11
2 parents 0f25665 + 6857969
commit 99c9c11
Show file tree

Hide file tree

Showing 5 changed files with 269 additions and 23 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -11,7 +11,8 @@
     "core-js": "^3.8.3",
     "lodash": "^4.17.21",
     "vue": "^2.6.14",
-    "vuetify": "^2.6.0"
+    "vuetify": "^2.6.0",
+    "xadesjs": "^2.4.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",

diff --git a/app/signing_key b/app/signing_key