Merge remote-tracking branch 'balazs/master'

2020-05-11 16:58:42 +02:00 · 2020-05-11 16:58:42 +02:00 · 53e96a5bf0
commit 53e96a5bf0
parent d4a7734bb5 ce69011b6f
1 changed files with 0 additions and 1 deletions
--- a/balazs/dot-cdist/type/__my_nginx_site/manifest~
+++ b/balazs/dot-cdist/type/__my_nginx_site/manifest~
@ -1 +0,0 @@
-require="__package/nginx" __file $nginx_config_dir/"$__object_id".conf
				`@ -1 +0,0 @@`
				`require="__package/nginx" __file $nginx_config_dir/"$__object_id".conf`