Skip to content

Commit 8207dfa

Browse files
committed
Merge branch 'dev' into beta
2 parents 275a83e + 959ac17 commit 8207dfa

23 files changed

+1245
-85
lines changed

.env.dockerized-norlab-project

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@
1818
PROJECT_PROMPT_NAME="dna"
1919

2020
#DNA_SPLASH_NAME_FULL="Dockerized-NorLab"
21-
DNA_SPLASH_NAME_FULL="Dockerized-NorLab (DN)"
21+
#DNA_SPLASH_NAME_FULL="Dockerized-NorLab (DN/DNA)"
22+
#DNA_SPLASH_NAME_FULL=" Dockerized-NorLab (DN) "
23+
#DNA_SPLASH_NAME_FULL=" Dockerized-NorLab project application "
24+
#DNA_SPLASH_NAME_FULL="Dockerized-NorLab project app"
25+
DNA_SPLASH_NAME_FULL=" Dockerized-NorLab project app "
2226
#DNA_SPLASH_NAME_FULL="Dockerized-NorLab project app (DNA)"
23-
#DNA_SPLASH_NAME_FULL="Dockerized-NorLab project application"
27+
#DNA_SPLASH_NAME_FULL="Dockerized-NorLab app (DNA)"
2428
DNA_SPLASH_NAME_SMALL="Dockerized-NorLab"
2529
#DNA_SPLASH_NAME_SMALL="DNA"
2630
#DNA_SPLASH_NAME_SMALL="·• DNA"

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)