You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/09/23 12:53:20 UTC
[incubator-dlab] 01/03: Merge branch 'DLAB-terraform' of
/Users/bohdan.hliva/IdeaProjects/incubator-dlab with conflicts.
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit dfb0134d6b00437b0044ecf26d9f3439f7d52313
Author: bhliva <bo...@epam.com>
AuthorDate: Mon Sep 23 14:52:06 2019 +0300
Merge branch 'DLAB-terraform' of /Users/bohdan.hliva/IdeaProjects/incubator-dlab with conflicts.
---
.../src/main/resources/webapp/src/dictionary/global.dictionary.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts
index 6d0d8ea..437016f 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/global.dictionary.ts
@@ -19,8 +19,8 @@
// from './{{ aws | gcp | azure }}.dictionary';
-import { NAMING_CONVENTION } from './CLOUD_PROVIDER.dictionary';
+import { NAMING_CONVENTION } from './aws.dictionary';
-export * from './CLOUD_PROVIDER.dictionary';
+export * from './aws.dictionary';
export const DICTIONARY = Object.freeze(NAMING_CONVENTION);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org