[commit-womb] gnumaint gnupackages.txt

[Brandon Invergo]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Brandon Invergo <brandon>       13/02/18 21:18:43

Modified files:
        .              : gnupackages.txt 

Log message:
        Resolve merge conflict

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.133&r2=1.134

Patches:
Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- gnupackages.txt     18 Feb 2013 21:15:59 -0000      1.133
+++ gnupackages.txt     18 Feb 2013 21:18:43 -0000      1.134
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.133 2013/02/18 21:15:59 brandon Exp $
+# $Id: gnupackages.txt,v 1.134 2013/02/18 21:18:43 brandon Exp $
 # Public domain.
 # 
 # This file is maintained in the CVS repository of GNU womb,
@@ -1948,11 +1948,7 @@
 doc-url: none
 gplv3-status: not-done-since-no-release
 activity-status: newmaint/20110519
-<<<<<<< gnupackages.txt
-last-contact: 17feb13 replied, 16feb13 asked, 8nov10 replied, soon
-=======
 last-contact: 16feb13 replied, asked, 8nov10 replied, soon
->>>>>>> 1.132
 
 package: less
 copyright-holder: notfsf