New commits:
commit 05d83bf49f07b08e72d18c31455823aae3e93e10
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
qt4: No longer seems to need a self-conflict during upgrades
diff --git a/x11-toolkits/qt4/CONFLICTS b/x11-toolkits/qt4/CONFLICTS
deleted file mode 100755
index be85071..0000000
--- a/x11-toolkits/qt4/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qt4 y
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 6964cde..1819071 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2009-10-10 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: No longer seems to need a self-conflict during upgrades
+
2009-10-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.5.3
new url
[SM-Commit] GIT changes to master grimoire by Eric Sandall (05d83bf49f07b08e72d18c31455823aae3e93e10),
Eric Sandall, 10/10/2009