diff options
author | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-03-02 23:38:27 +0100 |
---|---|---|
committer | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-03-02 23:38:27 +0100 |
commit | dce4e644d5e5d9c97ff5ac337448b52f2a2a64fd (patch) | |
tree | ffdb31f43958e8c557647a4bd61914d6d13486e4 /sandbox/TestIvanLjubisavljevic/frontend/src/app/app.component.html | |
parent | 9826a8079ffcd1d849a8a8821696d51691606133 (diff) |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Tamara
# Conflicts:
# .gitignore
Diffstat (limited to 'sandbox/TestIvanLjubisavljevic/frontend/src/app/app.component.html')
-rwxr-xr-x | sandbox/TestIvanLjubisavljevic/frontend/src/app/app.component.html | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sandbox/TestIvanLjubisavljevic/frontend/src/app/app.component.html b/sandbox/TestIvanLjubisavljevic/frontend/src/app/app.component.html new file mode 100755 index 00000000..39dcd1dd --- /dev/null +++ b/sandbox/TestIvanLjubisavljevic/frontend/src/app/app.component.html @@ -0,0 +1,6 @@ + +<div> + <h1>Dobrodošli u prvi online info servis laptopova</h1> + <app-navbar></app-navbar> +</div> +<router-outlet></router-outlet> |