chore: clean after merge

docs/changelog.html

@@ -37,10 +37,17 @@ <h3 id="921-2020-04-23"><a href="https://github.com/manfredsteyer/angular-oauth2
 <h2 id="920-2020-03-28"><a href="https://github.com/manfredsteyer/angular-oauth2-oidc/compare/v9.1.0...v9.2.0">9.2.0</a> (2020-03-28)</h2>
 <h3 id="features">Features</h3>
 <ul>
+<<<<<<< HEAD
 <li><p><strong>revoketokenandlogout:</strong> explicit way to revoke an access token according to <a href="https://tools.ietf.org/html/rfc7009">RFC 7009</a> (<a href="https://github.com/manfredsteyer/angular-oauth2-oidc/commit/c799eadbfa616d459af8be1a667499834745d78f">c799ead</a>)</p>
 </li>
 <li><p><strong>token-revocation:</strong> also revoke refresh_token (<a href="https://github.com/manfredsteyer/angular-oauth2-oidc/commit/429ed2c5b50c60ac857ff0ffe84c1d7fc995c6dd">429ed2c</a>)</p>
 </li>
+=======
+<li><strong>automatic silent refresh:</strong> stopAutomaticRefresh stops all timers. (<a href="https://github.com/manfredsteyer/angular-oauth2-oidc/commit/8ab853bf38dd162060d7b6cbd18f7b4fd5a84f18">8ab853b</a>)</li>
+<li><strong>code-flow:</strong> allow using silent refresh by setting useSilentRefresh to true (<a href="https://github.com/manfredsteyer/angular-oauth2-oidc/commit/93902a5808bb9b75a41d4bde44c6ab763bcfa9f6">93902a5</a>)</li>
+<li><strong>sample:</strong> Also use new Identity Server 4 for implicit flow demo to prevent issues with same site cookies (<a href="https://github.com/manfredsteyer/angular-oauth2-oidc/commit/58c63541bc7d83d72c30577da2b68ac2d1dc35b7">58c6354</a>)</li>
+<li><strong>session checks:</strong> Session checks work now for code flow too. Please see docs for details. (<a href="https://github.com/manfredsteyer/angular-oauth2-oidc/commit/4bf89014d8cc5d50ed716500e3f3ad265b4ae2db">4bf8901</a>)</li>
+>>>>>>> c587f55886805c38bd37c52894ef88d88dbf6240
 </ul>
 <h3 id="bug-fixes">Bug Fixes</h3>
 <ul>

package.json

@@ -6,7 +6,7 @@
     "release": "standard-version",
     "ng": "ng",
     "start": "ng serve --project sample -o",
-    "build": "npm run prettier && ng build --prod --project lib && npm run copy:readme && npm run docs",
+    "build": "npm run prettier && ng build --prod --project lib && npm run copy:readme && npm run copy:license && npm run docs",
     "build:jwks": "npm run prettier && ng build angular-oauth2-oidc-jwks --ts-config tsconfig.npm.json",
     "test": "ng test",
     "lint": "ng lint",
@@ -19,6 +19,7 @@
     "docs:watch": "npm run docs:build -- -s -w",
     "format": "prettier --single-quote --write projects/**/*.ts",
     "copy:readme": "cpr README.md dist/lib/README.md --overwrite",
+    "copy:license": "cpr LICENSE dist/lib/LICENSE --overwrite",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
     "contributer": "git shortlog -s 9.0.0..HEAD"
   },