1
0
mirror of https://github.com/bitwarden/jslib synced 2026-01-04 01:23:14 +00:00

Merge commit '193434461dbd9c48fe5dcbad95693470aec422ac' into feature/workspaces

# Conflicts:
#	spec/common/importers/firefoxCsvImporter.spec.ts
#	spec/common/importers/fsecureFskImporter.spec.ts
#	spec/common/importers/lastpassCsvImporter.spec.ts
#	spec/common/importers/nordpassCsvImporter.spec.ts
#	spec/common/importers/onepassword1PifImporter.spec.ts
#	spec/common/importers/onepasswordMacCsvImporter.spec.ts
#	spec/common/importers/onepasswordWinCsvImporter.spec.ts
#	spec/common/misc/sequentialize.spec.ts
#	spec/common/misc/throttle.spec.ts
#	spec/common/misc/utils.spec.ts
#	spec/common/services/cipher.service.spec.ts
#	spec/common/services/consoleLog.service.spec.ts
#	spec/common/services/export.service.spec.ts
#	spec/electron/services/electronLog.service.spec.ts
#	spec/electron/utils.spec.ts
#	spec/node/cli/consoleLog.service.spec.ts
#	spec/node/services/nodeCryptoFunction.service.spec.ts
#	spec/support/jasmine.json
#	spec/support/karma.conf.js
#	spec/utils.ts
#	spec/web/services/webCryptoFunction.service.spec.ts
This commit is contained in:
Hinton
2022-01-03 12:50:03 +01:00
2 changed files with 3 additions and 2 deletions

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
* text=auto eol=lf

View File

@@ -50,8 +50,8 @@ jobs:
- name: Install Node dependencies
run: npm install
# - name: Run linter
# run: npm run lint
- name: Run linter
run: npm run lint
- name: Build
run: npm run build