public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/hardened-refpolicy:testing commit in: /
@ 2014-08-07 12:41 Sven Vermeulen
  0 siblings, 0 replies; only message in thread
From: Sven Vermeulen @ 2014-08-07 12:41 UTC (permalink / raw
  To: gentoo-commits

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(-)


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-08-07 12:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-07 12:41 [gentoo-commits] proj/hardened-refpolicy:testing commit in: / Sven Vermeulen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox