Skip to content
Snippets Groups Projects
Commit a51b808e authored by Alexander Olofsson's avatar Alexander Olofsson
Browse files

Merge branch 'production' into 'production' 

# Conflicts:
#   manifests/init.pp
parents 0efa0b38 ce2f9fe5
No related branches found
No related tags found
1 merge request!2Merge till Production
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
manifests/init.pp
+ 1
− 1
View file @ a51b808e
...@@ -144,4 +144,4 @@ class skadereg { ...@@ -144,4 +144,4 @@ class skadereg {
} }
} }
} }
} }
\ 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