[freeside-commits] freeside/debian changelog,1.2.6.8,1.2.6.9

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/debian
In directory wavetail.420.am:/tmp/cvs-serv10475/debian

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	changelog 
Log Message:
1.7.4rc2

Index: changelog
===================================================================
RCS file: /home/cvs/cvsroot/freeside/debian/changelog,v
retrieving revision 1.2.6.8
retrieving revision 1.2.6.9
diff -u -d -r1.2.6.8 -r1.2.6.9
--- changelog	12 Aug 2009 22:26:03 -0000	1.2.6.8
+++ changelog	12 Aug 2009 22:27:05 -0000	1.2.6.9
@@ -1,18 +1,15 @@
-<<<<<<< changelog
 freeside (1.7.4~rc2-1) unstable; urgency=low
 
   * New upstream (RC) release
 
  -- Ivan Kohler <ivan-debian at 420.am>  Wed, 12 Aug 2009 14:18:29 -0700
 
-=======
 freeside (1.7.4~rc1-1) unstable; urgency=low
 
   * New upstream release
 
  -- Ivan Kohler <ivan-debian at 420.am>  Thu, 23 Jul 2009 14:01:10 -0700
 
->>>>>>> 1.2.6.7
 freeside (1.7.3-1) unstable; urgency=low
 
   * New upstream release