conflict with dependencies.pug resolved

src/dependencies.pug.orig

@@ -0,0 +1,51 @@
+// Scripts
+//- script(src="https://unpkg.com/@webcomponents/webcomponentsjs@1.2.7/webcomponents-loader.js")
+//script(src="/lib/webcomponentsjs/webcomponents-loader.js")
+//- script(src="lib/html-imports.js")
+
+script(src="/lib/oidc-client.js")
+script(
+  src="https://cdn.happy-dev.fr/sib-oidc/sib-oidc.js"
+  data-authority=`${sdn}/openid/`,
+  data-client_id=`${client_id}`,
+  data-response_type='id_token token',
+  data-scope='openid profile email',
+  data-automaticSilentRenew='true',
+  data-loadUserInfo='true'
+)
+
+script(src="/scripts/index.js")
+script(type="module" src="/scripts/hd-widgets.js")
+
+// Stylesheets
+link(rel='stylesheet', href='/lib/normalize.css')
+link(rel='stylesheet', href='/styles/index.css')
+link(
+  rel='stylesheet'
+  href='https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700&subset=latin-ext'
+)
+link(href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i" rel="stylesheet")
+
+// Web components
+
+//- local
+//script(type="module" src="/lib/sib-core/sib-display.js")
+//script(type="module" src="/lib/sib-router/sib-router.js")
+//script(type="module" src="/lib/sib-core/sib-form.js")
+
+link(rel='import', href='/lib/sib-chat/sib-chat.html')
+
+//- cdn
+<<<<<<< HEAD
+script(type="module" src="https://cdn.happy-dev.fr/sib-core/sib-display.js")
+script(type="module" src="https://cdn.happy-dev.fr/sib-router/sib-router.js")
+script(type="module" src="https://cdn.happy-dev.fr/sib-core/sib-form.js")
+=======
+script(type='module' src='https://cdn.happy-dev.fr/sib-core/sib-display.js')
+script(type='module' src='https://cdn.happy-dev.fr/sib-router/sib-router.js')
+script(type='module' src='https://cdn.happy-dev.fr/sib-chat/sib-chat.js')
+script(type='module' src='https://cdn.happy-dev.fr/sib-chat/sib-form.js')
+//- link(rel='import', href="https://cdn.happy-dev.fr/sib-core/sib-display.html")
+//- link(rel='import', href="https://cdn.happy-dev.fr/sib-router/sib-router.html")
+//- link(rel='import', href="https://cdn.happy-dev.fr/sib-chat/sib-chat.html")
+>>>>>>> e595053... pug syntax for scripts

www/lib/sib-chat

@@ -1 +1 @@
-Subproject commit 6bae574ac4eab3b4c6198fb7cfa77e743f0b67b8
+Subproject commit 6a85c71851bc0a8b8f21e0ce9c64711fbc40ae08

www/lib/sib-core

@@ -1 +1 @@
-Subproject commit cfd28e0779ffc15563dd3abe727cad3d6525ae0c
+Subproject commit a532e579d3303de73477c33f534556104837f648

www/lib/sib-router

@@ -1 +1 @@
-Subproject commit 86777f419b2ce98c9dc79b3c8bbe5f91255e0fea
+Subproject commit bb2796705cba0c17be7cc656671e1e4087cfd23f