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 86E8A1382AC for ; Sun, 19 Jun 2016 13:45:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0475E09A1; Sun, 19 Jun 2016 13:45:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9576AE09A1 for ; Sun, 19 Jun 2016 13:45:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 65ED53406F2 for ; Sun, 19 Jun 2016 13:45:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDE612416 for ; Sun, 19 Jun 2016 13:45:31 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1466343922.54f2348de8aed0a30960a340bbd762196da488a2.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/files/10-agent-startup.sh X-VCS-Directories: kde-plasma/plasma-workspace/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 54f2348de8aed0a30960a340bbd762196da488a2 X-VCS-Branch: master Date: Sun, 19 Jun 2016 13:45:31 +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: 1e119985-b260-43df-bdd8-35d0729d5fbc X-Archives-Hash: 8f66bb6dda7ac1df5a56b1c185102552 commit: 54f2348de8aed0a30960a340bbd762196da488a2 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 13:45:10 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 13:45:22 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=54f2348d kde-plasma/plasma-workspace: remove stray git garbage Package-Manager: portage-2.3.0_rc1 kde-plasma/plasma-workspace/files/10-agent-startup.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kde-plasma/plasma-workspace/files/10-agent-startup.sh b/kde-plasma/plasma-workspace/files/10-agent-startup.sh index 9f24233..e2c5018 100644 --- a/kde-plasma/plasma-workspace/files/10-agent-startup.sh +++ b/kde-plasma/plasma-workspace/files/10-agent-startup.sh @@ -26,11 +26,7 @@ if [ "${GPG_AGENT}" = true ]; then if [ -x /usr/bin/gpgconf ]; then gpgconf --launch gpg-agent >/dev/null 2>&1 if [ $? = 2 ]; then -<<<<<<< Updated upstream eval "$(/usr/bin/gpg-agent --enable-ssh-support --daemon)" -======= - eval "$(/usr/bin/gpg-agent --daemon)" ->>>>>>> Stashed changes fi fi fi