sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (3a10af98132fc1dffd9c83a92d37f911711e88f1)

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 (3a10af98132fc1dffd9c83a92d37f911711e88f1)
Date: Mon, 25 Sep 2017 20:11:19 +0000

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

mail/s-nail/CONFLICTS | 2 +-
mail/s-nail/HISTORY | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)

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

mail/s-nail: fix CONFLICTS

diff --git a/mail/s-nail/CONFLICTS b/mail/s-nail/CONFLICTS
index 7fcf3b4..6bab1e5 100755
--- a/mail/s-nail/CONFLICTS
+++ b/mail/s-nail/CONFLICTS
@@ -1 +1 @@
-mailx
+conflicts mailx
diff --git a/mail/s-nail/HISTORY b/mail/s-nail/HISTORY
index 0cbb1bd..f0b741f 100644
--- a/mail/s-nail/HISTORY
+++ b/mail/s-nail/HISTORY
@@ -1,3 +1,6 @@
+2017-09-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFLICTS: fix conflict with mailx
+
2017-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, CONFLICTS, DEPENDS, DETAILS, INSTALL: spell created

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (3a10af98132fc1dffd9c83a92d37f911711e88f1), Florian Franzmann, 09/25/2017