hotfix: fixing merge error between master release 0.3.2 and dev beta …

…release 1.0.0-beta.0

CHANGELOG.md

@@ -5,6 +5,39 @@ All notable changes to this project will be documented in this file. See [standa
 <a name="1.0.0-beta.0"></a>
 # 1.0.0-beta.0 (2018-08-14)
 
+<a name="0.3.2"></a>
+## 0.3.2 (2018-08-16)
+
+
+### Bug Fixes
+
+* added .github folder to npm ignore ([d946d83](https:/bloombergbna/fishtank-vue/commit/d946d83))
+* Removed InputCheckbox test ([a287115](https:/bloombergbna/fishtank-vue/commit/a287115))
+* stop tracking package-lock.json file ([cab1dcd](https:/bloombergbna/fishtank-vue/commit/cab1dcd))
+* stop tracking package-lock.json file ([630156c](https:/bloombergbna/fishtank-vue/commit/630156c))
+
+
+### Features
+
+* Added Checkbox test/review page ([b369e06](https:/bloombergbna/fishtank-vue/commit/b369e06))
+* Added Checkbox test/review page ([a3ff979](https:/bloombergbna/fishtank-vue/commit/a3ff979))
+* Added InputCheckbox.vue ([f994036](https:/bloombergbna/fishtank-vue/commit/f994036))
+* Added issue requests and pull request guideline docs. ([3b29c1b](https:/bloombergbna/fishtank-vue/commit/3b29c1b))
+* Added WIP Inpout Switch component ([3b838fd](https:/bloombergbna/fishtank-vue/commit/3b838fd))
+* Added WIP Inpout Switch component ([c28afe3](https:/bloombergbna/fishtank-vue/commit/c28afe3))
+* Binary. Removeable, and Multiselect tags ([#16](https:/bloombergbna/fishtank-vue/issues/16)) ([f272d49](https:/bloombergbna/fishtank-vue/commit/f272d49))
+* radio ([#18](https:/bloombergbna/fishtank-vue/issues/18)) ([930cd0c](https:/bloombergbna/fishtank-vue/commit/930cd0c))
+* Removed checkboxes from router ([b510eb6](https:/bloombergbna/fishtank-vue/commit/b510eb6))
+
+
+### BREAKING CHANGES
+
+* Deleted work in progress checkbox, switch, and tag components
+
+
+
+<a name="0.3.1"></a>
+## 0.3.1 (2018-08-16)
 
 ### Bug Fixes
 

package.json

@@ -17,8 +17,8 @@
  "test": "vue-cli-service test:unit --require tests/setup.js",
  "e2e": "vue-cli-service test:e2e",
  "lint": "vue-cli-service lint",
- "release": "standard-version",
- "prepublish": "yarn build"
+ "prepublish": "yarn build",
+ "release": "standard-version"
  },
  "publishConfig": {
  "registry": "https://registry.npmjs.org/"