autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

patch: conflict resolved

Browse Source
This commit is contained in:
gaelle morin 2021-01-25 13:52:51 +01:00
parent f80358c29b
commit e2381174a0
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dependencies.pug
View File

@ -24,18 +24,6 @@ if endpoints.get
//- script(type="module" src="/lib/sib-resource/sib-resource.js" defer) //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer)
if endpoints.get.joboffers if endpoints.get.joboffers
<<<<<<< HEAD
//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@beta" defer)
script(type="module" src="/lib/solid-job-board/dist/index.js" defer)
if endpoints.get.uploads && endpoints.get.skills && endpoints.get.users
//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-directory@beta" defer)
script(type="module" src="/lib/solid-directory/dist/index.js" defer)
if endpoints.get.dashboards
//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@beta" defer)
script(type="module" src="/lib/solid-dashboard/dist/index.js" defer)
=======
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@2.0" defer) script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@2.0" defer)
//- script(type="module" src="/lib/solid-job-board/dist/index.js" defer) //- script(type="module" src="/lib/solid-job-board/dist/index.js" defer)
@ -46,7 +34,6 @@ if endpoints.get
if endpoints.get.dashboards if endpoints.get.dashboards
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@1.0" defer) script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@1.0" defer)
//- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer)
>>>>>>> 2c05cf1bf758ade9d44af962e3452ee8c2e61495
if endpoints.get.users if endpoints.get.users
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@2.0" defer) script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@2.0" defer)