From: masensio Date: Mon, 14 Sep 2015 12:07:05 +0000 (+0200) Subject: Update setup, changes from the issue #1154 X-Git-Tag: oc-android-1.8~8^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8ed97d743324bebd0c23905ff5f2eeb3248f872f?hp=--cc Update setup, changes from the issue #1154 --- 8ed97d743324bebd0c23905ff5f2eeb3248f872f diff --git a/SETUP.md b/SETUP.md index 59a51cab..0f1bc8ed 100644 --- a/SETUP.md +++ b/SETUP.md @@ -36,7 +36,7 @@ Next steps will assume you have a Github account and that you will get the code * Open a terminal and go on with the next steps in it. * Clone your forked repository: ```git clone git@github.com:YOURGITHUBNAME/android.git```. * Move to the project folder with ```cd android```. -* Checkout the remote branch 'master' in your own local branch 'master': ```git checkout -b master remotes/origin/master```. +* Checkout the remote branch 'master' in your own local branch 'master': ```git checkout master remotes/origin/master```. * Pull any changes from your remote branch 'master': ```git pull origin master``` * Make official ownCloud repo known as upstream: ```git remote add upstream git@github.com:owncloud/android.git``` * Make sure to get the latest changes from official android/master branch: ```git pull upstream master``` diff --git a/doc/oCC2015_Android_workshop.odp b/doc/oCC2015_Android_workshop.odp index 104d2233..29ed242a 100644 Binary files a/doc/oCC2015_Android_workshop.odp and b/doc/oCC2015_Android_workshop.odp differ