Merge pull request #1155 from owncloud/update_setup_guide

Update setup, changes from the issue #1154

diff --git a/SETUP.md b/SETUP.md
index 59a51ca..0f1bc8e 100644 (file)
--- 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 104d223..29ed242 100644 (file)
Binary files a/doc/oCC2015_Android_workshop.odp and b/doc/oCC2015_Android_workshop.odp differ