diff options
author | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-24 06:31:08 +0100 |
---|---|---|
committer | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-24 06:31:08 +0100 |
commit | 042482a1bbd6ea3460acf3d71bfe3ef64b05524a (patch) | |
tree | e79413f97a8c9f97c978b5048ab89278ab0e6a41 /frontend/src/app/_pages/my-models | |
parent | 0aa45260963dbf0a52726f791c3813928a1bcebc (diff) | |
parent | 1113f094ffee030fd9892deb7577927419860013 (diff) |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
# Conflicts:
# frontend/src/app/app.module.ts
Diffstat (limited to 'frontend/src/app/_pages/my-models')
-rw-r--r-- | frontend/src/app/_pages/my-models/my-models.component.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/frontend/src/app/_pages/my-models/my-models.component.html b/frontend/src/app/_pages/my-models/my-models.component.html index 2fea257d..e69de29b 100644 --- a/frontend/src/app/_pages/my-models/my-models.component.html +++ b/frontend/src/app/_pages/my-models/my-models.component.html @@ -1 +0,0 @@ -<p>my-models works!</p> |