Skip to content

Commit

Permalink
Merge pull request #14 from zembrodt/develop
Browse files Browse the repository at this point in the history
Merge develop into main
  • Loading branch information
zembrodt authored Jan 31, 2024
2 parents 616f092 + 6034fa5 commit a133b57
Show file tree
Hide file tree
Showing 21 changed files with 16,409 additions and 21,931 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ speed-measure-plugin*.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
18 changes: 3 additions & 15 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
Expand Down Expand Up @@ -95,19 +94,6 @@
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand All @@ -127,5 +113,7 @@
}
}
},
"defaultProject": "portfolio"
"cli": {
"analytics": false
}
}
Loading

0 comments on commit a133b57

Please sign in to comment.