From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A7A971393DD for ; Thu, 7 Aug 2014 12:41:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84A02E08A0; Thu, 7 Aug 2014 12:41:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5658E089F for ; Thu, 7 Aug 2014 12:41:52 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC5F13402AF for ; Thu, 7 Aug 2014 12:41:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 9FF9A1881D for ; Thu, 7 Aug 2014 12:41:50 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1407415179.7bf3f6bc6f88f863ccfd1fbcdbb1958d32c1bdb7.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:testing commit in: / X-VCS-Repository: proj/hardened-refpolicy X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 7bf3f6bc6f88f863ccfd1fbcdbb1958d32c1bdb7 X-VCS-Branch: testing Date: Thu, 7 Aug 2014 12:41:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 51b47c42-c4d4-419e-867b-70e561eda1b4 X-Archives-Hash: f8cca5fd296b01c830f605bfb917f944 commit: 7bf3f6bc6f88f863ccfd1fbcdbb1958d32c1bdb7 Author: Sven Vermeulen siphos be> AuthorDate: Thu Aug 7 12:39:39 2014 +0000 Commit: Sven Vermeulen gentoo 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(-)