diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2016-06-19 23:45:10 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-06-19 23:45:22 +1000 |
| commit | 54f2348de8aed0a30960a340bbd762196da488a2 (patch) | |
| tree | c9e8f9144ff889883e08c8fe94910ec5c4402d33 | |
| parent | ab2dcbe096fea49f2f61b96e7e34d8ed50e9d692 (diff) | |
| download | kde-54f2348de8aed0a30960a340bbd762196da488a2.tar.gz kde-54f2348de8aed0a30960a340bbd762196da488a2.tar.bz2 kde-54f2348de8aed0a30960a340bbd762196da488a2.zip | |
kde-plasma/plasma-workspace: remove stray git garbage
Package-Manager: portage-2.3.0_rc1
| -rw-r--r-- | kde-plasma/plasma-workspace/files/10-agent-startup.sh | 4 |
1 files changed, 0 insertions, 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 9f242331528..e2c50188365 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 |