[Lunar-commits] <moonbase> Revert "libvorbis: version bumped to 1.2.2."

[Florin Braescu]

commit be150bb74ad8a5e36b1cd4ca23e4ae08d579e96c
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Thu Jun 25 09:47:59 2009 +0300

    Revert "libvorbis: version bumped to 1.2.2."
    
    This reverts commit 6f1ec0eb6f2421644d4c297775c1710e34d579e9.
    
    Conflicts:
    
    	audio/libvorbis/DETAILS
    
    libvorbis: revert the buggy commit.
---
 audio/libvorbis/DETAILS |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/audio/libvorbis/DETAILS b/audio/libvorbis/DETAILS
index dbef352..340ea0f 100644
--- a/audio/libvorbis/DETAILS
+++ b/audio/libvorbis/DETAILS
@@ -1,19 +1,11 @@
           MODULE=libvorbis
          VERSION=1.2.2
           SOURCE=$MODULE-$VERSION.tar.gz
-<<<<<<< HEAD:audio/libvorbis/DETAILS
       SOURCE_URL=http://downloads.xiph.org/releases/vorbis
       SOURCE_VFY=sha1:629890c77c6abb56243232f25578c466e27950c7
         WEB_SITE=http://www.xiph.org/ogg/vorbis
          ENTERED=20010922
-         UPDATED=20090625
-=======
-      SOURCE_URL=http://downloads.xiph.org/releases/vorbis/
-      SOURCE_VFY=sha1:629890c77c6abb56243232f25578c466e27950c7
-        WEB_SITE=http://www.xiph.org/ogg/vorbis
-         ENTERED=20010922
          UPDATED=20090624
->>>>>>> a09cd7898eaf7ac5350aa138d5141c72c732c6a1:audio/libvorbis/DETAILS
            SHORT="A free high-quality lossy audio codec library"
 
 cat << EOF