sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (581a3a1832075bd90175b0b3d0dc1581f998bad1)

From: Treeve Jelbert <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (581a3a1832075bd90175b0b3d0dc1581f998bad1)
Date: Mon, 28 Aug 2017 14:37:07 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/gnupg-2.2/CONFLICTS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 581a3a1832075bd90175b0b3d0dc1581f998bad1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gnupg-2.2 - fix CONFLICTS

diff --git a/crypto/gnupg-2.2/CONFLICTS b/crypto/gnupg-2.2/CONFLICTS
index 27f5f37..529e8d0 100755
--- a/crypto/gnupg-2.2/CONFLICTS
+++ b/crypto/gnupg-2.2/CONFLICTS
@@ -1,2 +1,2 @@
conflicts gnupg-exp
-conflicts gnupg-2.2 y
+conflicts gnupg-2.1 y

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (581a3a1832075bd90175b0b3d0dc1581f998bad1), Treeve Jelbert, 08/28/2017