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 /backend/microservice/PythonServer | |
| 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 'backend/microservice/PythonServer')
| -rw-r--r-- | backend/microservice/PythonServer/project/socket_example/socket/client.py (renamed from backend/microservice/PythonServer/project/api/socket/client.py) | 0 | ||||
| -rw-r--r-- | backend/microservice/PythonServer/project/socket_example/socket/server.py (renamed from backend/microservice/PythonServer/project/api/socket/server.py) | 0 | ||||
| -rw-r--r-- | backend/microservice/PythonServer/project/socket_example/socket2/client.py (renamed from backend/microservice/PythonServer/project/api/socket2/client.py) | 0 | ||||
| -rw-r--r-- | backend/microservice/PythonServer/project/socket_example/socket2/server.py (renamed from backend/microservice/PythonServer/project/api/socket2/server.py) | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/backend/microservice/PythonServer/project/api/socket/client.py b/backend/microservice/PythonServer/project/socket_example/socket/client.py index d5740e25..d5740e25 100644 --- a/backend/microservice/PythonServer/project/api/socket/client.py +++ b/backend/microservice/PythonServer/project/socket_example/socket/client.py diff --git a/backend/microservice/PythonServer/project/api/socket/server.py b/backend/microservice/PythonServer/project/socket_example/socket/server.py index d6ff3f7c..d6ff3f7c 100644 --- a/backend/microservice/PythonServer/project/api/socket/server.py +++ b/backend/microservice/PythonServer/project/socket_example/socket/server.py diff --git a/backend/microservice/PythonServer/project/api/socket2/client.py b/backend/microservice/PythonServer/project/socket_example/socket2/client.py index 65e76b55..65e76b55 100644 --- a/backend/microservice/PythonServer/project/api/socket2/client.py +++ b/backend/microservice/PythonServer/project/socket_example/socket2/client.py diff --git a/backend/microservice/PythonServer/project/api/socket2/server.py b/backend/microservice/PythonServer/project/socket_example/socket2/server.py index c65dae78..c65dae78 100644 --- a/backend/microservice/PythonServer/project/api/socket2/server.py +++ b/backend/microservice/PythonServer/project/socket_example/socket2/server.py |