From c9aa63de014acca245ff2f2efd50be8792a93176 Mon Sep 17 00:00:00 2001 From: tabthorpe Date: Fri, 30 Oct 2009 19:38:53 +0000 Subject: - Fix CONFLICTS missed in previous commit --- misc/bibletime/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile index be4efff32869..b475b0cc8298 100644 --- a/misc/bibletime/Makefile +++ b/misc/bibletime/Makefile @@ -23,7 +23,7 @@ USE_CMAKE= yes USE_QT_VER= 4 QT_COMPONENTS= corelib dbus gui qtestlib script webkit xml qmake_build moc_build uic_build rcc_build -CONFLICTS= bibletime-devel-2* +CONFLICTS= bibletime-kde3-1* .include -- cgit