commit: 7bf3f6bc6f88f863ccfd1fbcdbb1958d32c1bdb7 Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> AuthorDate: Thu Aug 7 12:39:39 2014 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> CommitDate: Thu Aug 7 12:39:39 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=7bf3f6bc
Fix merge conflict policy/modules/kernel/files.if | 29 +++++++++++++++++++++++++++++ policy/modules/system/tmpfiles.te | 10 +++++----- 2 files changed, 34 insertions(+), 5 deletions(-)
