X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Ffreeside-debian-releases.sh;h=03a163a7918bf8998ac037f6fb7a6ef69b096750;hb=709bd7a384bd8dbde3a15185708a7598e91130d5;hp=e832d9176fb0ad142085749d6822fba2f8458404;hpb=eb3b8cfe19d3602634f2d668de2ee4d974d51c59;p=freeside.git diff --git a/bin/freeside-debian-releases.sh b/bin/freeside-debian-releases.sh index e832d9176..03a163a79 100644 --- 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