src/main.cpp · 58dc1435c1a2ea8e949052e5316a31bd78e93340 · AcubeSat-OBC / ECSS Services · GitLab

Snippets Groups Projects

"...git@git.noc.ruhr-uni-bochum.de:pohlsvkp/teqp_fork_old.git" did not exist on "381d948fdd9ecbc966c93c3a009c184461871afe"

6 years ago
0f9b3987
Merge branch 'master' into 'ECSS_ST-01' · 0f9b3987
Dimitrios Stoupis authored 6 years ago
```
# Conflicts:
#   CMakeLists.txt
#   inc/Services/RequestVerificationService.hpp
#   src/main.cpp
```
0f9b3987

History
Merge branch 'master' into 'ECSS_ST-01'
Dimitrios Stoupis authored 6 years ago
```
# Conflicts:
#   CMakeLists.txt
#   inc/Services/RequestVerificationService.hpp
#   src/main.cpp
```