New commits:
commit 2c4c62c777225aea304074907bcc6be85e384f8b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
nc: does not conflict with nedit (nedit installs ncl).
diff --git a/net/nc/CONFLICTS b/net/nc/CONFLICTS
deleted file mode 100755
index efdbaab..0000000
--- a/net/nc/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts nedit
diff --git a/net/nc/HISTORY b/net/nc/HISTORY
index 00be4d7..2d2ca87 100644
--- a/net/nc/HISTORY
+++ b/net/nc/HISTORY
@@ -1,3 +1,6 @@
+2011-04-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: does not conflict with nedit anymore since years
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (921d284d50c74eada6df48a08cd20ceea33f260c),
Thomas Orgis, 04/17/2011