Mege conflict resolved

resources/i18n/en.json

...admin/admin-registries/admin-registries-routing.module.ts

src/app/+admin/admin-registries/admin-registries.module.ts

.../add-bitstream-format/add-bitstream-format.component.html

...d-bitstream-format/add-bitstream-format.component.spec.ts

...ts/add-bitstream-format/add-bitstream-format.component.ts

...-registries/bitstream-formats/bitstream-format.actions.ts

...tries/bitstream-formats/bitstream-format.reducers.spec.ts

...registries/bitstream-formats/bitstream-format.reducers.ts

...ies/bitstream-formats/bitstream-formats-routing.module.ts

...stries/bitstream-formats/bitstream-formats.component.html

...ies/bitstream-formats/bitstream-formats.component.spec.ts

...gistries/bitstream-formats/bitstream-formats.component.ts

...-registries/bitstream-formats/bitstream-formats.module.ts

...egistries/bitstream-formats/bitstream-formats.resolver.ts

...dit-bitstream-format/edit-bitstream-format.component.html

...-bitstream-format/edit-bitstream-format.component.spec.ts

.../edit-bitstream-format/edit-bitstream-format.component.ts

.../bitstream-formats/format-form/format-form.component.html

...tstream-formats/format-form/format-form.component.spec.ts