New commits:
commit 7db1e56806c20ab76edc88867d6bb7b30aba00d1
Author: Matthew Clark <matthewclark AT inlesserterms.net>
Commit: Matthew Clark <matthewclark AT inlesserterms.net>
Removed conflict for kdenetwork, since kdenetwork no longer
builds kopete (bug 12932)
commit 7e6a49a0ccf2232276bd184b6c623bbf26c5cbb5
Author: Matthew Clark <matthewclark AT inlesserterms.net>
Commit: Matthew Clark <matthewclark AT inlesserterms.net>
Since we have a kopete spell, then the kdenetwork spell will
no longer build kopete. Fixes bug 12932.
diff --git a/kde-apps/kopete/CONFLICTS b/kde-apps/kopete/CONFLICTS
deleted file mode 100755
index 1a757c8..0000000
--- a/kde-apps/kopete/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts kdenetwork
-
diff --git a/kde-apps/kopete/HISTORY b/kde-apps/kopete/HISTORY
index 3f36524..5ad167b 100644
--- a/kde-apps/kopete/HISTORY
+++ b/kde-apps/kopete/HISTORY
@@ -1,3 +1,6 @@
+2006-08-01 Matthew Clark <matthewclark AT inlesserterms.net>
+ * CONFLICTS: Removed, as kdenetwork no longer builds kopete
+
2006-07-13 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.12.1