New commits:
commit 0d002dbd5622f442fd23135699b6904386f7e64d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>
basesystem: removed CONFLICTS
removed CONFLICS, only deinstall gnupg when installing an alternative,
this prevents breakage of sorcery which relies on the presence of a
gpg binary to do both hash and signature verification
diff --git a/smgl/basesystem/CONFLICTS b/smgl/basesystem/CONFLICTS
deleted file mode 100755
index 8de899b..0000000
--- a/smgl/basesystem/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts gnupg y
diff --git a/smgl/basesystem/HISTORY b/smgl/basesystem/HISTORY
index af647e8..19ccbbb 100644
--- a/smgl/basesystem/HISTORY
+++ b/smgl/basesystem/HISTORY
@@ -1,3 +1,6 @@
+2019-05-11 Remko van der Vossen <wich AT sourcemage.org>
+ * CONFLICTS: removed, only deinstall gnupg when installing an
alternative
+
2019-01-25 Pavel Vinogradov <public AT sourcemage.org>
* FINAL: dropped, not needed, GNUPG handles transition
[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (0d002dbd5622f442fd23135699b6904386f7e64d),
Remko van der Vossen, 05/11/2019