conflit resolution

package.json.orig

@@ -0,0 +1,56 @@
+{
+  "name": "wekan",
+<<<<<<< HEAD
+  "version": "v5.71.0",
+=======
+  "version": "v5.69.0",
+>>>>>>> 23d403f8... v5.69
+  "description": "Open-Source kanban",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/wekan/wekan.git"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/wekan/wekan/issues"
+  },
+  "homepage": "https://wekan.github.io",
+  "devDependencies": {
+    "babel-plugin-istanbul": "^6.1.1",
+    "chai": "^4.3.4",
+    "flatted": "^3.2.2",
+    "puppeteer": "^10.2.0",
+    "sinon": "^11.1.2"
+  },
+  "dependencies": {
+    "@babel/core": "^7.15.0",
+    "@babel/runtime": "^7.15.3",
+    "@wekanteam/markdown-it-mermaid": "^0.5.0",
+    "ajv": "^6.12.6",
+    "babel-runtime": "^6.26.0",
+    "bcryptjs": "^2.4.3",
+    "bson": "^4.4.1",
+    "bunyan": "^1.8.15",
+    "core-js": "^2.6.12",
+    "dompurify": "^2.3.0",
+    "es6-promise": "^4.2.4",
+    "exceljs": "^4.2.1",
+    "fibers": "^5.0.0",
+    "gridfs-stream": "https://github.com/wekan/gridfs-stream/tarball/master",
+    "jszip": "^3.7.1",
+    "ldapjs": "^2.3.1",
+    "markdown-it": "^12.2.0",
+    "markdown-it-emoji": "^2.0.0",
+    "meteor-node-stubs": "^1.1.0",
+    "mongodb": "^3.6.11",
+    "os": "^0.1.2",
+    "page": "^1.11.5",
+    "papaparse": "^5.3.1",
+    "qs": "^6.10.1",
+    "source-map-support": "^0.5.19"
+  },
+  "meteor": {
+    "testModule": "tests/main.js"
+  }
+}