Merge branch 'stretch_merge' of https://github.com/cliffe/SecGen into stretch_merge

This commit is contained in:
thomashaw
2018-10-08 15:41:25 +01:00

View File

@@ -32,4 +32,8 @@
<name>Kali.*</name>
</conflict>
<requires>
<type>update</type>
</requires>
</service>