diff options
| author | Ivan Ljubisavljevic <ivan996sk@gmail.com> | 2022-04-30 00:45:38 +0200 |
|---|---|---|
| committer | Ivan Ljubisavljevic <ivan996sk@gmail.com> | 2022-04-30 00:45:38 +0200 |
| commit | 1c723f051d723a743718f11c69e39b7913235bb7 (patch) | |
| tree | 2987fcc40a9e79d3b0ee1c59531fd1c8126c46d4 /frontend/src/app/_pages/experiment/experiment.component.ts | |
| parent | 46502957863f8366232b63738f40fd4df4e995fa (diff) | |
| parent | 7257f187324a59864d7db29c72fdb63f12900f40 (diff) | |
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
# Conflicts:
# frontend/src/app/_elements/folder/folder.component.html
# frontend/src/app/_elements/folder/folder.component.ts
Diffstat (limited to 'frontend/src/app/_pages/experiment/experiment.component.ts')
| -rw-r--r-- | frontend/src/app/_pages/experiment/experiment.component.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts index d80ba70f..70f941b6 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.ts +++ b/frontend/src/app/_pages/experiment/experiment.component.ts @@ -3,6 +3,7 @@ import { StepperSelectionEvent } from '@angular/cdk/stepper'; import { MatStepper } from '@angular/material/stepper'; import Shared from 'src/app/Shared'; import { FolderType } from 'src/app/_data/FolderFile'; +import { TabType } from 'src/app/_elements/folder/folder.component'; @Component({ selector: 'app-experiment', @@ -89,4 +90,6 @@ export class ExperimentComponent implements AfterViewInit { FolderType = FolderType; + TabType = TabType; + } |