chore: remove merges on changelogs

doczjs · Jun 26, 2018 · 67314f5 · 67314f5
1 parent 137225f
commit 67314f5
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 116 deletions.
diff --git a/examples/css-sass/CHANGELOG.md b/examples/css-sass/CHANGELOG.md
@@ -3,7 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-<<<<<<< HEAD
 <a name="0.3.3"></a>
 ## [0.3.3](https://github.com/pedronauck/docz/compare/v0.3.2...v0.3.3) (2018-06-26)
 
@@ -31,8 +30,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-=======
->>>>>>> 3b032f823c1ef6e777351365bdc0c919db232086
 <a name="0.3.0"></a>
 # [0.3.0](https://github.com/pedronauck/docz/compare/v0.3.0-beta.0...v0.3.0) (2018-06-25)
 

diff --git a/examples/flow/CHANGELOG.md b/examples/flow/CHANGELOG.md
@@ -3,294 +3,220 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-<<<<<<< HEAD
 <a name="0.3.3"></a>
-## [0.3.3](https://github.com/pedronauck/docz/compare/v0.3.2...v0.3.3) (2018-06-26)
 
+## [0.3.3](https://github.com/pedronauck/docz/compare/v0.3.2...v0.3.3) (2018-06-26)
 
 ### Bug Fixes
 
-* **docz-core:** copy templates files for dist ([#88](https://github.com/pedronauck/docz/issues/88)) ([5e4b98d](https://github.com/pedronauck/docz/commit/5e4b98d))
-
-
-
+- **docz-core:** copy templates files for dist ([#88](https://github.com/pedronauck/docz/issues/88)) ([5e4b98d](https://github.com/pedronauck/docz/commit/5e4b98d))
 
 <a name="0.3.2"></a>
-## [0.3.2](https://github.com/pedronauck/docz/compare/v0.3.1...v0.3.2) (2018-06-25)
-
-
 
+## [0.3.2](https://github.com/pedronauck/docz/compare/v0.3.1...v0.3.2) (2018-06-25)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.3.1"></a>
-## [0.3.1](https://github.com/pedronauck/docz/compare/v0.2.11...v0.3.1) (2018-06-25)
 
+## [0.3.1](https://github.com/pedronauck/docz/compare/v0.2.11...v0.3.1) (2018-06-25)
 
 ### Features
 
-* **docz-default-theme:** dark mode and responsiveness ([#87](https://github.com/pedronauck/docz/issues/87)) ([a4db115](https://github.com/pedronauck/docz/commit/a4db115)), closes [#81](https://github.com/pedronauck/docz/issues/81)
-
-
-
+- **docz-default-theme:** dark mode and responsiveness ([#87](https://github.com/pedronauck/docz/issues/87)) ([a4db115](https://github.com/pedronauck/docz/commit/a4db115)), closes [#81](https://github.com/pedronauck/docz/issues/81)
 
-=======
->>>>>>> 3b032f823c1ef6e777351365bdc0c919db232086
 <a name="0.3.0"></a>
-# [0.3.0](https://github.com/pedronauck/docz/compare/v0.3.0-beta.0...v0.3.0) (2018-06-25)
-
-
 
+# [0.3.0](https://github.com/pedronauck/docz/compare/v0.3.0-beta.0...v0.3.0) (2018-06-25)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.3.0-beta.0"></a>
-# [0.3.0-beta.0](https://github.com/pedronauck/docz/compare/v0.2.11...v0.3.0-beta.0) (2018-06-25)
-
-
 
+# [0.3.0-beta.0](https://github.com/pedronauck/docz/compare/v0.2.11...v0.3.0-beta.0) (2018-06-25)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.11"></a>
-## [0.2.11](https://github.com/pedronauck/docz/compare/v0.2.10...v0.2.11) (2018-06-22)
-
-
 
+## [0.2.11](https://github.com/pedronauck/docz/compare/v0.2.10...v0.2.11) (2018-06-22)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.10"></a>
-## [0.2.10](https://github.com/pedronauck/docz/compare/v0.2.9...v0.2.10) (2018-06-21)
-
-
 
+## [0.2.10](https://github.com/pedronauck/docz/compare/v0.2.9...v0.2.10) (2018-06-21)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.9"></a>
-## [0.2.9](https://github.com/pedronauck/docz/compare/v0.2.8...v0.2.9) (2018-06-21)
-
-
 
+## [0.2.9](https://github.com/pedronauck/docz/compare/v0.2.8...v0.2.9) (2018-06-21)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.8"></a>
-## [0.2.8](https://github.com/pedronauck/docz/compare/v0.2.7...v0.2.8) (2018-06-21)
-
-
 
+## [0.2.8](https://github.com/pedronauck/docz/compare/v0.2.7...v0.2.8) (2018-06-21)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.7"></a>
-## [0.2.7](https://github.com/pedronauck/docz/compare/v0.2.6...v0.2.7) (2018-06-20)
-
-
 
+## [0.2.7](https://github.com/pedronauck/docz/compare/v0.2.6...v0.2.7) (2018-06-20)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.6"></a>
-## [0.2.6](https://github.com/pedronauck/docz/compare/v0.2.5...v0.2.6) (2018-06-17)
-
-
 
+## [0.2.6](https://github.com/pedronauck/docz/compare/v0.2.5...v0.2.6) (2018-06-17)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.5"></a>
-## [0.2.5](https://github.com/pedronauck/docz/compare/v0.2.4...v0.2.5) (2018-06-15)
-
-
 
+## [0.2.5](https://github.com/pedronauck/docz/compare/v0.2.4...v0.2.5) (2018-06-15)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.4"></a>
-## [0.2.4](https://github.com/pedronauck/docz/compare/v0.2.3...v0.2.4) (2018-06-13)
-
-
 
+## [0.2.4](https://github.com/pedronauck/docz/compare/v0.2.3...v0.2.4) (2018-06-13)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.3"></a>
-## [0.2.3](https://github.com/pedronauck/docz/compare/v0.2.2...v0.2.3) (2018-06-13)
-
-
 
+## [0.2.3](https://github.com/pedronauck/docz/compare/v0.2.2...v0.2.3) (2018-06-13)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.2"></a>
-## [0.2.2](https://github.com/pedronauck/docz/compare/v0.2.1...v0.2.2) (2018-06-12)
-
-
 
+## [0.2.2](https://github.com/pedronauck/docz/compare/v0.2.1...v0.2.2) (2018-06-12)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.1"></a>
-## [0.2.1](https://github.com/pedronauck/docz/compare/v0.2.0...v0.2.1) (2018-06-12)
-
-
 
+## [0.2.1](https://github.com/pedronauck/docz/compare/v0.2.0...v0.2.1) (2018-06-12)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.0"></a>
-# [0.2.0](https://github.com/pedronauck/docz/compare/v0.2.0-beta.2...v0.2.0) (2018-06-11)
-
-
 
+# [0.2.0](https://github.com/pedronauck/docz/compare/v0.2.0-beta.2...v0.2.0) (2018-06-11)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.0-beta.2"></a>
-# [0.2.0-beta.2](https://github.com/doczjs/docz/compare/v0.2.0-beta.1...v0.2.0-beta.2) (2018-06-10)
 
+# [0.2.0-beta.2](https://github.com/doczjs/docz/compare/v0.2.0-beta.1...v0.2.0-beta.2) (2018-06-10)
 
 ### Bug Fixes
 
-* **docz-core:** autolink headings ([0b8369d](https://github.com/doczjs/docz/commit/0b8369d))
-
-
-
+- **docz-core:** autolink headings ([0b8369d](https://github.com/doczjs/docz/commit/0b8369d))
 
 <a name="0.2.0-beta.1"></a>
-# [0.2.0-beta.1](https://github.com/doczjs/docz/compare/v0.2.0-beta.0...v0.2.0-beta.1) (2018-06-10)
-
-
 
+# [0.2.0-beta.1](https://github.com/doczjs/docz/compare/v0.2.0-beta.0...v0.2.0-beta.1) (2018-06-10)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.2.0-beta.0"></a>
-# [0.2.0-beta.0](https://github.com/doczjs/docz/compare/v0.1.2-beta.6...v0.2.0-beta.0) (2018-06-10)
-
-
 
+# [0.2.0-beta.0](https://github.com/doczjs/docz/compare/v0.1.2-beta.6...v0.2.0-beta.0) (2018-06-10)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.2-beta.6"></a>
-## [0.1.2-beta.6](https://github.com/doczjs/docz/compare/v0.1.2-beta.5...v0.1.2-beta.6) (2018-06-09)
-
-
 
+## [0.1.2-beta.6](https://github.com/doczjs/docz/compare/v0.1.2-beta.5...v0.1.2-beta.6) (2018-06-09)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.2-beta.5"></a>
-## [0.1.2-beta.5](https://github.com/doczjs/docz/compare/v0.1.2-beta.4...v0.1.2-beta.5) (2018-06-09)
-
-
 
+## [0.1.2-beta.5](https://github.com/doczjs/docz/compare/v0.1.2-beta.4...v0.1.2-beta.5) (2018-06-09)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.2-beta.4"></a>
-## [0.1.2-beta.4](https://github.com/doczjs/docz/compare/v0.1.2-beta.3...v0.1.2-beta.4) (2018-06-09)
-
-
 
+## [0.1.2-beta.4](https://github.com/doczjs/docz/compare/v0.1.2-beta.3...v0.1.2-beta.4) (2018-06-09)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.2-beta.3"></a>
-## [0.1.2-beta.3](https://github.com/doczjs/docz/compare/v0.1.2-beta.2...v0.1.2-beta.3) (2018-06-09)
-
-
 
+## [0.1.2-beta.3](https://github.com/doczjs/docz/compare/v0.1.2-beta.2...v0.1.2-beta.3) (2018-06-09)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.2-beta.2"></a>
-## [0.1.2-beta.2](https://github.com/doczjs/docz/compare/v0.1.2-beta.1...v0.1.2-beta.2) (2018-06-09)
-
-
 
+## [0.1.2-beta.2](https://github.com/doczjs/docz/compare/v0.1.2-beta.1...v0.1.2-beta.2) (2018-06-09)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.2-beta.1"></a>
-## [0.1.2-beta.1](https://github.com/doczjs/docz/compare/v0.1.2-beta.0...v0.1.2-beta.1) (2018-06-09)
-
-
 
+## [0.1.2-beta.1](https://github.com/doczjs/docz/compare/v0.1.2-beta.0...v0.1.2-beta.1) (2018-06-09)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.2-beta.0"></a>
-## [0.1.2-beta.0](https://github.com/doczjs/docz/compare/v0.1.1...v0.1.2-beta.0) (2018-06-02)
-
-
 
+## [0.1.2-beta.0](https://github.com/doczjs/docz/compare/v0.1.1...v0.1.2-beta.0) (2018-06-02)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.1-beta.6"></a>
-## [0.1.1-beta.6](https://github.com/doczjs/docz/compare/v0.1.1-beta.5...v0.1.1-beta.6) (2018-06-01)
-
-
 
+## [0.1.1-beta.6](https://github.com/doczjs/docz/compare/v0.1.1-beta.5...v0.1.1-beta.6) (2018-06-01)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.1-beta.5"></a>
-## [0.1.1-beta.5](https://github.com/doczjs/docz/compare/v0.1.1-beta.4...v0.1.1-beta.5) (2018-06-01)
-
-
 
+## [0.1.1-beta.5](https://github.com/doczjs/docz/compare/v0.1.1-beta.4...v0.1.1-beta.5) (2018-06-01)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.1-beta.4"></a>
-## [0.1.1-beta.4](https://github.com/doczjs/docz/compare/v0.1.1-beta.3...v0.1.1-beta.4) (2018-05-29)
-
-
 
+## [0.1.1-beta.4](https://github.com/doczjs/docz/compare/v0.1.1-beta.3...v0.1.1-beta.4) (2018-05-29)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.1-beta.3"></a>
-## [0.1.1-beta.3](https://github.com/doczjs/docz/compare/v0.1.1-beta.2...v0.1.1-beta.3) (2018-05-29)
-
-
 
+## [0.1.1-beta.3](https://github.com/doczjs/docz/compare/v0.1.1-beta.2...v0.1.1-beta.3) (2018-05-29)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.1-beta.2"></a>
-## [0.1.1-beta.2](https://github.com/doczjs/docz/compare/v0.1.1-beta.0...v0.1.1-beta.2) (2018-05-29)
-
-
 
+## [0.1.1-beta.2](https://github.com/doczjs/docz/compare/v0.1.1-beta.0...v0.1.1-beta.2) (2018-05-29)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.1-beta.1"></a>
-## [0.1.1-beta.1](https://github.com/doczjs/docz/compare/v0.1.1-beta.0...v0.1.1-beta.1) (2018-05-29)
-
-
 
+## [0.1.1-beta.1](https://github.com/doczjs/docz/compare/v0.1.1-beta.0...v0.1.1-beta.1) (2018-05-29)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.1-beta.0"></a>
-## [0.1.1-beta.0](https://github.com/doczjs/docz/compare/v0.1.0...v0.1.1-beta.0) (2018-05-29)
-
-
 
+## [0.1.1-beta.0](https://github.com/doczjs/docz/compare/v0.1.0...v0.1.1-beta.0) (2018-05-29)
 
 **Note:** Version bump only for package docz-example-flow
 
 <a name="0.1.0"></a>
-# 0.1.0 (2018-05-29)
 
+# 0.1.0 (2018-05-29)
 
 ### Features
 
-* **docz-example-flow:** add example folder ([27002d8](https://github.com/doczjs/docz/commit/27002d8))
+- **docz-example-flow:** add example folder ([27002d8](https://github.com/doczjs/docz/commit/27002d8))