diff options
| author | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-29 12:27:29 +0200 |
|---|---|---|
| committer | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-29 12:27:29 +0200 |
| commit | 2bae49ecb411d13d1d9d78e764340468f7f49f44 (patch) | |
| tree | 3b7907e172438775291954fb5a8b54541059acc6 /.gitignore | |
| parent | 9f3d674413affc18377c8f2564bb660270ffe7f5 (diff) | |
| parent | 98d580ca1ba501bc059ff417dd1794e0f6a68407 (diff) | |
Merge branch 'trening' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
# Conflicts:
# frontend/src/app/_services/models.service.ts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -4,4 +4,6 @@ sandbox/test-projekat-danijel/backend/.vs/ sandbox/testAppSonja/MiniApkSonja/MiniApkSonja/bin/ sandbox/testAppSonja/MiniApkSonja/MiniApkSonja/obj/ sandbox/TestTamara/TestTamara/TestTamara/obj/ -sandbox/TestTamara/TestTamara/TestTamara/bin/
\ No newline at end of file +sandbox/TestTamara/TestTamara/TestTamara/bin/ +backend/microservice/temp/ +backend/microservice/api/__pycache__/ |