Skip to content
Snippets Groups Projects
Commit 355429db authored by Pieter Donker's avatar Pieter Donker
Browse files

CWG-44, fixed merge failure

parent 2a6de257
No related branches found
No related tags found
1 merge request!316Resolve CWG-44
Pipeline #46166 passed
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
# . See https://support.astron.nl/confluence/display/L2M/L3+SDP+Decision%3A+Gitlab+pipeline+automation+to+test+SDPFW+with+OPC+UA # . See https://support.astron.nl/confluence/display/L2M/L3+SDP+Decision%3A+Gitlab+pipeline+automation+to+test+SDPFW+with+OPC+UA
stages: stages:
- linting
- simulation - simulation
- synthesis - synthesis
- hardware - hardware
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment