chore: fix conflicts

dhis2 · Mar 31, 2021 · 8fa8a57 · 8fa8a57
1 parent 85959a2
commit 8fa8a57
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "data-visualizer",
     "description": "DHIS2 Data Visualizer",
     "private": true,
-    "version": "35.20.19",
+    "version": "36.0.0",
     "workspaces": [
         "packages/*"
     ],

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "data-visualizer-app",
-    "version": "35.20.19",
+    "version": "36.0.0",
     "description": "DHIS2 Data Visualizer app",
     "license": "BSD-3-Clause",
     "private": true,
@@ -17,7 +17,7 @@
         "@dhis2/app-runtime": "^2.8.0",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-ui-interpretations": "^7.1.6",
-        "@dhis2/data-visualizer-plugin": "35.20.19",
+        "@dhis2/data-visualizer-plugin": "36.0.0",
         "@dhis2/ui": "^6.5.5",
         "@material-ui/icons": "^3.0.1",
         "d2": "^31.9.1",

diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/data-visualizer-plugin",
-    "version": "35.20.19",
+    "version": "36.0.0",
     "description": "DHIS2 Data Visualizer plugin",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",