sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (17fce41eb96165c5c2db8176b71f14502ff21b0d)

From: Florian Franzmann <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (17fce41eb96165c5c2db8176b71f14502ff21b0d)
Date: Sun, 7 Jan 2018 15:02:59 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

utils/gnu-parallel/CONFLICTS | 1 +
utils/gnu-parallel/HISTORY | 1 +
2 files changed, 2 insertions(+)

New commits:
commit 17fce41eb96165c5c2db8176b71f14502ff21b0d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/gnu-parallel: conflicts moreutils

diff --git a/utils/gnu-parallel/CONFLICTS b/utils/gnu-parallel/CONFLICTS
new file mode 100755
index 0000000..7588cec
--- /dev/null
+++ b/utils/gnu-parallel/CONFLICTS
@@ -0,0 +1 @@
+conflicts moreutils
diff --git a/utils/gnu-parallel/HISTORY b/utils/gnu-parallel/HISTORY
index 814b11b..583a6a3 100644
--- a/utils/gnu-parallel/HISTORY
+++ b/utils/gnu-parallel/HISTORY
@@ -1,3 +1,4 @@
2018-01-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: spell created
+ * CONFLICTS: conflicts moreutils

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (17fce41eb96165c5c2db8176b71f14502ff21b0d), Florian Franzmann, 01/07/2018