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 85B041381F3 for ; Mon, 12 Aug 2013 19:31:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6648EE0B4F; Mon, 12 Aug 2013 19:31:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8896E0B4F for ; Mon, 12 Aug 2013 19:31:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1B3933EAD9 for ; Mon, 12 Aug 2013 19:31:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 65B97E5459 for ; Mon, 12 Aug 2013 19:31:09 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1376335823.ca3d811724b031efab9549fb900bfec4bb786a91.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: bin/ebuild-helpers/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild-helpers/prepstrip X-VCS-Directories: bin/ebuild-helpers/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: ca3d811724b031efab9549fb900bfec4bb786a91 X-VCS-Branch: prefix Date: Mon, 12 Aug 2013 19:31:09 +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: 266bc0ce-5746-453d-9460-2bed62f2ec83 X-Archives-Hash: 7207fee895aef4e235831e51a66b4127 commit: ca3d811724b031efab9549fb900bfec4bb786a91 Author: Fabian Groffen gentoo org> AuthorDate: Mon Aug 12 19:30:23 2013 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Aug 12 19:30:23 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ca3d8117 prepstrip: remove stray conflict marker --- bin/ebuild-helpers/prepstrip | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip index 35c84d5..8222492 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -1,4 +1,3 @@ -<<<<<<< HEAD #!@PORTAGE_BASH@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2