New commits:
commit b32c8bb6ddbb9e99b4658e73eb7fb01f9dd63f03
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>
z-http/icecat-bin:
CONFLICTS: added icecat
diff --git a/z-http/icecat-bin/CONFLICTS b/z-http/icecat-bin/CONFLICTS
index 86dbbf3..c4be82c 100755
--- a/z-http/icecat-bin/CONFLICTS
+++ b/z-http/icecat-bin/CONFLICTS
@@ -1 +1,2 @@
-conflicts iceweasel-bin y
+conflicts iceweasel-bin y &&
+conflicts icecat y
diff --git a/z-http/icecat-bin/HISTORY b/z-http/icecat-bin/HISTORY
index 0c3b648..035943a 100644
--- a/z-http/icecat-bin/HISTORY
+++ b/z-http/icecat-bin/HISTORY
@@ -1,3 +1,6 @@
+2007-12-20 Pol Vinogradov <vin.public AT gmail.com>
+ * CONFLICTS: added icecat
+
2007-12-16 Alexander Tsamutali <astsmtl AT gmail.com>
* BUILD, CONFIGURE, DEPENDS, DETAILS, HISTORY, INSTALL, PROVIDES:
Created this spell
[SM-Commit] GIT changes to master z-rejected grimoire by Pol Vinogradov (f96b5d5114ff189a336a074a5ba954e285909a79),
Pol Vinogradov, 12/20/2007