am --skip: revert changes introduced by failed 3way merge

diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index fc5ca99046ee2cd7e126c0c1aeb1455d7bb4e29f..cd2baef383df7dbea5b1544a162f99573476520e 100755 (executable)
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-gpg_version=`gpg --version 2>&1`
+gpg_version=$(gpg --version 2>&1)
 if test $? = 127; then
        say "You do not seem to have gpg installed"
 else