Increment version.

Author: Ahmad45123

package.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin-plugin-conflict-resolution",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "scripts": {
     "dist": "webpack --joplin-plugin-config buildMain && webpack --joplin-plugin-config buildExtraScripts && webpack --joplin-plugin-config createArchive",
     "prepare": "npm run dist",

src/manifest.json

@@ -2,7 +2,7 @@
 	"manifest_version": 1,
 	"id": "joplin-plugin-conflict-resolution",
 	"app_min_version": "2.0.9",
-	"version": "1.1.0",
+	"version": "1.2.0",
 	"name": "Conflict Resolution",
 	"description": "A plugin that makes process of resolving conflicts easier.",
 	"author": "Ahmed Alwasifey",