Skip to content

Commit

Permalink
Merge branch 'dev' into deps/angulartics2-14.x
Browse files Browse the repository at this point in the history
  • Loading branch information
dweinholz authored Aug 15, 2024
2 parents 6f8cb62 + e61604c commit 8db8520
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
1 change: 0 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
17 changes: 9 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"e2e": "npm-run-all -p -r webdriver-start protractor",
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet",
"compodoc": "./node_modules/.bin/compodoc -p src/tsconfig.app.json",
"prepare": "husky install"
"prepare": "husky init"
},
"resolutions": {},
"private": true,
Expand Down Expand Up @@ -67,7 +67,7 @@
"ngx-cookie-service": "18.0.0",
"ngx-matomo-client": "6.3.0",
"ngx-owl-carousel-o": "18.0.0",
"ngx-scrollbar": "13.0.3",
"ngx-scrollbar": "15.1.2",
"postcss-loader": "8.1.1",
"postcss-url": "10.1.3",
"rxjs": "7.8.1",
Expand Down

0 comments on commit 8db8520

Please sign in to comment.