fix: merge conflict resolve

lokesh-coder · Nov 2, 2018 · a412259 · a412259
2 parents 6db7797 + 64d5e70
commit a412259
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.0.11](https://github.com/lokesh-coder/toppy/compare/v1.0.10...v1.0.11) (2018-11-01)
+
+
+### Bug Fixes
+
+* move archive logic to verfiyRelease stage ([cdce3c1](https://github.com/lokesh-coder/toppy/commit/cdce3c1))
+
 ## [1.0.10](https://github.com/lokesh-coder/toppy/compare/v1.0.9...v1.0.10) (2018-11-01)
 
 

diff --git a/docs/assets/archived-versions.json b/docs/assets/archived-versions.json
@@ -1 +1 @@
-{"undefined":1541115139547}
+{"undefined":1541115139547,"1.0.11":1541115874348}
diff --git a/docs/environments/version.ts b/docs/environments/version.ts
@@ -1 +1 @@
-export const TOPPY_VERSION='1.0.10'
+export const TOPPY_VERSION='1.0.11'
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "toppy-app",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "Overlay library for Angular 7+",
   "keywords": [
     "angular",