[Lunar-commits] <moonbase> qt4: ignore

[Dennis 'stumbles' Veatch]

commit 615a6a107068308d5e19767386fe3bbe5f58f610
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Fri Aug 15 13:51:59 2008 -0400

    qt4: ignore
---
 kde4/base/qt4/DETAILS |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/kde4/base/qt4/DETAILS b/kde4/base/qt4/DETAILS
index 8b1bd0d..ee9af28 100644
--- a/kde4/base/qt4/DETAILS
+++ b/kde4/base/qt4/DETAILS
@@ -8,16 +8,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-x11-opensource-src-${VERSION}
    MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
         WEB_SITE=http://www.trolltech.com/qt
          ENTERED=20020420
-<<<<<<< HEAD:kde4/base/qt4/DETAILS
-<<<<<<< HEAD:kde4/base/qt4/DETAILS
-=======
->>>>>>> 153fc85613afd986dfbfdbc3b152f012632b7f95:kde4/base/qt4/DETAILS
          UPDATED=20080703
          UPDATED=20080801
-<<<<<<< HEAD:kde4/base/qt4/DETAILS
->>>>>>> dd882d78c93cff3fba2c3194d56e69ae1d6ff681:kde4/base/qt4/DETAILS
-=======
->>>>>>> 153fc85613afd986dfbfdbc3b152f012632b7f95:kde4/base/qt4/DETAILS
          GARBAGE=off
      FTP_PASSIVE=on
       MAINTAINER=florin at lunar-linux.org