FIX #00000 Build prod

dist/index.html

@@ -15,10 +15,6 @@
             <img src="assets/spinner.gif"/>
         </div>
     </app-root>
-<<<<<<< HEAD
-<script src="runtime-es2015.4ac42fef445445e6f3d0.js" type="module"></script><script src="runtime-es5.4ac42fef445445e6f3d0.js" nomodule defer></script><script src="polyfills-es5.8c2a86db22bc37211976.js" nomodule defer></script><script src="polyfills-es2015.f8f86766446f4344eec7.js" type="module"></script><script src="scripts.3f995a62571f9f668311.js" defer></script><script src="main-es2015.915cc00ec855e484ab07.js" type="module"></script><script src="main-es5.915cc00ec855e484ab07.js" nomodule defer></script></body>
-=======
-<script src="runtime-es2015.c17dd3df7381a2296e04.js" type="module"></script><script src="runtime-es5.c17dd3df7381a2296e04.js" nomodule defer></script><script src="polyfills-es5.75b6ffa131ed9d18e439.js" nomodule defer></script><script src="polyfills-es2015.a3390f1652700a53f04b.js" type="module"></script><script src="scripts.3f995a62571f9f668311.js" defer></script><script src="main-es2015.3d404926f4ee217e86bc.js" type="module"></script><script src="main-es5.3d404926f4ee217e86bc.js" nomodule defer></script></body>
->>>>>>> 20.10.12
+<script src="runtime-es2015.4ac42fef445445e6f3d0.js" type="module"></script><script src="runtime-es5.4ac42fef445445e6f3d0.js" nomodule defer></script><script src="polyfills-es5.8c2a86db22bc37211976.js" nomodule defer></script><script src="polyfills-es2015.f8f86766446f4344eec7.js" type="module"></script><script src="scripts.3f995a62571f9f668311.js" defer></script><script src="main-es2015.cc0b25c9db8a56871977.js" type="module"></script><script src="main-es5.cc0b25c9db8a56871977.js" nomodule defer></script></body>
 
 </html>
\ No newline at end of file

node_modules/.bin/JSONStream

-../JSONStream/bin.js
\ No newline at end of file

node_modules/.bin/acorn

-../acorn/bin/acorn
\ No newline at end of file

node_modules/.bin/ansi-html

-../ansi-html/bin/ansi-html
\ No newline at end of file

node_modules/.bin/atob

-../atob/bin/atob.js
\ No newline at end of file

node_modules/.bin/autoprefixer

-../autoprefixer/bin/autoprefixer
\ No newline at end of file

node_modules/.bin/blocking-proxy

-../blocking-proxy/built/lib/bin.js
\ No newline at end of file

node_modules/.bin/browserslist

-../browserslist/cli.js
\ No newline at end of file

node_modules/.bin/build-optimizer

-../@angular-devkit/build-optimizer/src/build-optimizer/cli.js
\ No newline at end of file

node_modules/.bin/cssesc

-../cssesc/bin/cssesc
\ No newline at end of file

node_modules/.bin/errno

-../errno/cli.js
\ No newline at end of file

node_modules/.bin/esparse

-../esprima/bin/esparse.js
\ No newline at end of file

node_modules/.bin/esvalidate

-../esprima/bin/esvalidate.js
\ No newline at end of file

node_modules/.bin/he

-../he/bin/he
\ No newline at end of file

node_modules/.bin/html-minifier

-../html-minifier/cli.js
\ No newline at end of file