update: merge conflict resolved + fixes

This commit is contained in:
gaelle morin
2021-01-21 23:54:20 +01:00
28 changed files with 274 additions and 239 deletions

6
package-lock.json generated
View File

@ -1159,9 +1159,9 @@
}
},
"@startinblox/hubl-styling-framework": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.4.0.tgz",
"integrity": "sha512-SPkKRrWUzS2TJaesnCumr+DkixODktBbWc2P8kMRNUFBe2hJ+U6vKGtxVmnoPQPcGmm3sJJ4ZC2ZHbeZX1DCHg=="
"version": "1.4.4",
"resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.4.4.tgz",
"integrity": "sha512-X52jdEgG283HMtXAyKeM3R0YLVwJuKSsR4ZU+h7CUmLrtZ+iPtHDgIu3Z9f17NmrF94zisy7FZaZvG/CWm1trg=="
},
"@types/q": {
"version": "1.5.4",