changelog

verbb · Jul 11, 2019 · 24e67f1 · 24e67f1
1 parent 40ce00f
commit 24e67f1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,21 +1,17 @@
 # Changelog
 
-<<<<<<< HEAD
 ## 1.2.0 - 2019-07-11
 
 ### Added
 - Add support for Craft 3.2.0+.
 - Fix incorrect element table attributes.
 
-## 1.1.11 - 2019-06-18
-=======
 ## 1.1.12 - 2019-06-28
 
 ### Fixed
 - Fix incorrect element table attributes.
 
 ## 1.1.11 - 2019-06-27
->>>>>>> e8b789be77ca9c33c758f8cef7404c715b1ca089
 
 ### Fixed
 - Don’t redirect from submissions unless we have to.

diff --git a/composer.json b/composer.json
@@ -2,11 +2,7 @@
     "name": "verbb/workflow",
     "description": "A Craft CMS plugin to create a workflow for publishing entries.",
     "type": "craft-plugin",
-<<<<<<< HEAD
     "version": "1.2.0",
-=======
-    "version": "1.1.12",
->>>>>>> e8b789be77ca9c33c758f8cef7404c715b1ca089
     "keywords": [
         "craft",
         "cms",