From be05e74c6dce4e6cd6e6019ced5a7a2a18f75a2c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 13 Oct 2016 23:46:10 +0100
Subject: [PATCH] Conventional pull on upgrade

---
 src/freedombone-upgrade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index 39c637f6..6a544498 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -63,7 +63,8 @@ if [ -d $PROJECT_DIR ]; then
         cd $PROJECT_DIR
         rm -rf $PROJECT_DIR/locale/*
         git checkout stockholm
-        git_pull $PROJECT_REPO
+        # TODO after stockholm merge change this to git_pull
+        git pull $PROJECT_REPO
         make install
         ${PROJECT_NAME} -c $CONFIGURATION_FILE
     fi