From: ivan <ivan>
Date: Wed, 12 Aug 2009 22:26:03 +0000 (+0000)
Subject: 1.7.4rc2
X-Git-Tag: freeside_1_7_4rc2~5
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=91b98a755e164d2fee808fc19db5a402263e4d51;p=freeside.git

1.7.4rc2
---

diff --git a/Makefile b/Makefile
index 99f843b51..6b99a8bb2 100644
--- a/Makefile
+++ b/Makefile
@@ -117,8 +117,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
 
-VERSION=1.7.4rc1
-TAG=freeside_1_7_4rc1
+VERSION=1.7.4rc2
+TAG=freeside_1_7_4rc2
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
diff --git a/debian/changelog b/debian/changelog
index e017613db..33c2f7a01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,18 @@
+<<<<<<< changelog
+freeside (1.7.4~rc2-1) unstable; urgency=low
+
+  * New upstream (RC) release
+
+ -- Ivan Kohler <ivan-debian@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@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