Skip to content
Snippets Groups Projects
Commit c48633a1 authored by Benjamin Bolling's avatar Benjamin Bolling
Browse files

Merge branch 'master' into 'master' 

File in wrong folder. Moved to correct one.

See merge request !167
parents d84c232d d4029298
No related branches found
No related tags found
1 merge request!167File in wrong folder. Moved to correct one.
Pipeline #178857 passed
Stage: deploy
    Expand all Hide whitespace changes
    Inline Side-by-side
    crs_cms_ctrl_plc_002.archive deleted 100644 → 0
    + 0
    − 4944
    View file @ d84c232d
    This diff is collapsed.
    files/crs_cms_ctrl_plc_002.archive
    + 130
    − 0
    View file @ c48633a1
    This diff is collapsed.
    files/matilda.archive 0 → 100644
    + 15
    − 0
    View file @ c48633a1
    ############
    # Few PVs for the Matilda IOC
    # can be removed at some moment AFTER March
    ############
    Matilda::Active
    Matilda:HVAC-4003:State
    Matilda:ATM-3067:State
    Matilda:AIM-3067:State
    Matilda:AGM-3067:State
    Matilda:TSS:State
    Matilda:D02-Stack:State
    Matilda:1015:Flow
    Matilda:1010:Vol
    Matilda:1011:Vol
    Matilda::SecondsInScenario
    \ No newline at end of file
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment