# Conflicts:
#	src/app/modules/terminal/terminal.module.ts
#	src/app/pages/account/account.module.ts
#	src/app/pages/account/groups/groups.module.ts
#	src/app/pages/account/users/users.module.ts
#	src/app/pages/api-keys/api-keys.module.ts
#	src/app/pages/credentials/credentials.module.ts
#	src/app/pages/data-protection/data-protection.module.ts
#	src/app/pages/datasets/modules/encryption/encryption.module.ts
#	src/app/pages/datasets/modules/snapshots/snapshots.module.ts
#	src/app/pages/directory-service/directory-service.module.ts
#	src/app/pages/jobs/jobs-list.module.ts
#	src/app/pages/network/network.module.ts
#	src/app/pages/services/services.module.ts
#	src/app/pages/sharing/sharing.module.ts
#	src/app/pages/shell/shell.module.ts
#	src/app/pages/storage/modules/devices/devices.module.ts
#	src/app/pages/storage/modules/disks/disks.module.ts
#	src/app/pages/system/system.module.ts
#	src/app/pages/vm/vm.module.ts

# Conflicts:
#	src/app/modules/entity/entity.module.ts
#	src/app/pages/account/account.module.ts
#	src/app/pages/datasets/modules/snapshots/snapshots.module.ts
#	src/app/pages/jobs/jobs-list.module.ts
#	src/app/pages/storage/storage.module.ts
#	src/app/pages/system/system.module.ts
#	src/app/pages/vm/vm.module.ts