Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development_3.0' into chemical_r…
Browse files Browse the repository at this point in the history
…egistration_form

# Conflicts:
#	package.json
#	src/app/core/substance-form/substance-form.component.html
#	src/app/core/substance-form/substance-form.component.ts
  • Loading branch information
krajla committed Apr 2, 2024
2 parents 63e1012 + ab386fa commit f309e56
Show file tree
Hide file tree
Showing 230 changed files with 58,239 additions and 1,265 deletions.
19 changes: 0 additions & 19 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -243,22 +243,6 @@
"with": "src/environments/environment.fda.local.ts"
}
]
},
"cbg.prod": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.cbg.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
}
}
},
Expand Down Expand Up @@ -291,9 +275,6 @@
},
"gsrs.prod": {
"browserTarget": "gsrs-client:build:gsrs.prod"
},
"cbg.prod": {
"browserTarget": "gsrs-client:build:cbg.prod"
}
}
},
Expand Down
Loading

0 comments on commit f309e56

Please sign in to comment.