chore: merge conflicts

wojtek-krysiak · wojtek-krysiak · commit 7c6ac436fb55 · 2020-10-09T15:44:35.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@admin-bro/upload",
-  "version": "1.1.0",
+  "version": "1.0.0-beta.10",
   "main": "index.js",
   "types": "types/index.d.ts",
   "private": false,
