Skip to content
Snippets Groups Projects
Commit c0acbbec authored by Joakim Olovsson's avatar Joakim Olovsson
Browse files

Merge branch 'test' into 'production' 

Test

See merge request !2
parents d6a17e50 00d543f0
Branches
No related tags found
2 merge requests!15Revert "fix more name conflicts",!2Test
Pipeline #70385 passed
Stage: puppet
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
manifests/init.pp 0 → 100644
+ 2
− 0
View file @ c0acbbec
class vlc {
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment