diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2016-03-03 18:06:14 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2016-03-03 18:06:14 -0800 |
| commit | 77836e28456599e997fe8dff570a17804fba6351 (patch) | |
| tree | ecde44d481e29cb8f097447274d96a3a50d46587 | |
| parent | 33d9bee6c95a0cfbab986524eafda84afc5a5d11 (diff) | |
fix release script
| -rw-r--r-- | bin/freeside-debian-releases.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |