diff options
| author | Sonja Galovic <galovicsonja@gmail.com> | 2022-03-15 21:32:58 +0100 |
|---|---|---|
| committer | Sonja Galovic <galovicsonja@gmail.com> | 2022-03-15 21:32:58 +0100 |
| commit | d6c8dc0a22cfe3cb0ed1579f5dc7c4c0e6d9b3de (patch) | |
| tree | d5e8d368d08f2168e66438f486706af530b3b9c4 /frontend/package.json | |
| parent | ca592566e80a7a83fff85e0b5a11bcca06f7e017 (diff) | |
| parent | f6496f86182902f2a6e5e34554ae93116d04c5b6 (diff) | |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
# Conflicts:
# frontend/src/app/_pages/add-model/add-model.component.html
Diffstat (limited to 'frontend/package.json')
| -rw-r--r-- | frontend/package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontend/package.json b/frontend/package.json index 0b32837f..01cdf462 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -49,4 +49,4 @@ "karma-jasmine-html-reporter": "~1.7.0", "typescript": "~4.5.2" } -} +}
\ No newline at end of file |