[Lunar-commits] <moonbase> soprano: ignore

[Dennis 'stumbles' Veatch]

commit 4850155cc3bbced22bc6ea659c02ab0a01acdc4b
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Fri Aug 15 13:52:38 2008 -0400

    soprano: ignore
---
 kde4/utils/soprano/DETAILS |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/kde4/utils/soprano/DETAILS b/kde4/utils/soprano/DETAILS
index 66a6bab..41bff4e 100644
--- a/kde4/utils/soprano/DETAILS
+++ b/kde4/utils/soprano/DETAILS
@@ -5,19 +5,10 @@
       SOURCE_VFY=sha1:167140b06ba0d3dfafa4a53823f9f39ce6a3cb15
         WEB_SITE=http://soprano.sourceforge.net
          ENTERED=20080123
-<<<<<<< HEAD:kde4/utils/soprano/DETAILS
-<<<<<<< HEAD:kde4/utils/soprano/DETAILS
-=======
->>>>>>> 153fc85613afd986dfbfdbc3b152f012632b7f95:kde4/utils/soprano/DETAILS
          UPDATED=20080703
            SHORT="a highly usable for RDF data"
          UPDATED=20080731
            SHORT="A highly usable C++/QT4 library for RDF data"
-	   
-<<<<<<< HEAD:kde4/utils/soprano/DETAILS
->>>>>>> dd882d78c93cff3fba2c3194d56e69ae1d6ff681:kde4/utils/soprano/DETAILS
-=======
->>>>>>> 153fc85613afd986dfbfdbc3b152f012632b7f95:kde4/utils/soprano/DETAILS
 cat << EOF
 Soprano (formerly known as QRDF) is a library which provides a highly
 usable object-oriented C++/QT4 framework for RDF data. It uses different