New commits:
commit 1363ce5b315338c8bcb9441104ca9c89f698fbc9
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>
zope3: Added conflicts twisted-core
diff --git a/devel/zope3/CONFLICTS b/devel/zope3/CONFLICTS
index 5242bbc..37eb683 100755
--- a/devel/zope3/CONFLICTS
+++ b/devel/zope3/CONFLICTS
@@ -1,2 +1,2 @@
-conflicts twisted
-
+conflicts twisted &&
+conflicts twisted-core
diff --git a/devel/zope3/HISTORY b/devel/zope3/HISTORY
index 78f7253..2f3a24b 100644
--- a/devel/zope3/HISTORY
+++ b/devel/zope3/HISTORY
@@ -1,3 +1,6 @@
+2006-11-18 George Sherwood <george AT beernabeer.com>
+ * CONFLICTS: Added conflicts twisted-core
+
2006-09-30 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 3.3.0
[SM-Commit] GIT changes to master grimoire by George Sherwood (10cf2627a8e28ab84e242800d9c6b27110752f07),
George Sherwood, 11/18/2006