[freeside-commits] branch master updated. 0769dd2b2f407d4b4b7f2864eb8690cd631c345b

[Ivan]

The branch, master has been updated
       via  0769dd2b2f407d4b4b7f2864eb8690cd631c345b (commit)
      from  25e5b21adf718408a64bf4596b644c6901e5da1e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0769dd2b2f407d4b4b7f2864eb8690cd631c345b
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Mar 3 18:06:11 2016 -0800

    fix release script

diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh
index e832d91..03a163a 100755
--- a/bin/freeside-debian-releases.sh
+++ b/bin/freeside-debian-releases.sh
@@ -27,7 +27,9 @@ rm -fr $DIR/freeside/debian/freeside-ng-selfservice.conffiles
 
 # Pull any changes
 cd $DIR/freeside
-STATUS=`git pull`
+git checkout -- debian/changelog
+git pull
+#STATUS=`git pull`
 
 #Assign the proper config files for freeside-ng-selfservice
 if [ $DISTRO = "wheezy" ]; then

-----------------------------------------------------------------------

Summary of changes:
 bin/freeside-debian-releases.sh |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)