diff options
author | Sonja Galovic <galovicsonja@gmail.com> | 2022-05-03 22:41:50 +0200 |
---|---|---|
committer | Sonja Galovic <galovicsonja@gmail.com> | 2022-05-03 22:41:50 +0200 |
commit | 52109040514ba5f9f20ef3e93e97571e67277eee (patch) | |
tree | 384b9d01357d241a15b1b49da44a9087a50f938e /frontend/src/app/_pages/experiment | |
parent | 3e0243ee1512d4e9bf390ecf4b39eba832caf4da (diff) | |
parent | 2d10f9892404aa82020965cf91178c34b93bdfce (diff) |
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
# Conflicts:
# frontend/package-lock.json
# frontend/src/app/_elements/folder/folder.component.ts
# frontend/src/app/_elements/form-model/form-model.component.html
Diffstat (limited to 'frontend/src/app/_pages/experiment')
-rw-r--r-- | frontend/src/app/_pages/experiment/experiment.component.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 39304469..baae864e 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -37,7 +37,7 @@ </div> <div #steps id="step_3" class="step-content"> <div class="step-content-inside"> - <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels, TabType.PublicModels]" (okPressed)="goToPage(3)"></app-folder> + <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels]" (okPressed)="goToPage(3)"></app-folder> </div> </div> <div #steps id="step_4" class="step-content"> |