fixed merge conflicts

SETUP.md

@@ -19,7 +19,6 @@ Open a terminal and type 'android' to start the Android SDK Manager. To build th
 * Android SDK Tools and Android SDK Platform-tools (already installed); upgrade to their last versions is usually a good idea.
 * Android SDK Build-Tools; any version from 20 or later should work fine; avoid preview versions, if any available.
 * Android 4.4.2 (API 19), SDK Platform; needed for build/test ownCloud app.
-* Android 5.1.1 (API 22), SDK Platform; needed to build FAB Library (not neeeded if working with Android Studio and gradle) and build the owncloud app.
 * Android 6.0 (API 23), SDK Platform; needed to build the Android Support Library (not neeeded if working with Android Studio or gradle) and build the owncloud app.
 
 Install any other package you consider interesting, such as emulators.
@@ -98,23 +97,11 @@ The generated APK file is saved in android/build/outputs/apk as android-debug.ap
 ** ownCloud Sample Client (optional)
 ** ownCloud Android library test project (optional)
 ** ownCloud Android library test cases (optional)
-=======
-  - owncloud-android 
-  - android-support-appcompat-v7-exploded-aar
-  - android-support-design-exploded-aar
-  - com-getbase-floatingactionbutton-1-10-0-exploded-aar
-  - owncloud-android-workaround-accounts	(optional)
-  - ownCloud Android Library
-  - ownCloud Sample Client (optional)
-  - ownCloud Android library test project (optional)
-  - ownCloud Android library test cases (optional)
->>>>>>> further formatting
 * Do not choose the project owncloud-android-tests; it's obsolete.
 * Do not enable 'Copy projects into workspace'.
 * Click the 'Finish' button.	
 * Wait for a while; if 'Build automatically' is enabled in Eclipse, some errors could appear during the creation of the projects, but all of them should finally disappear.
 * If any error persists, clean and build manually the next projects in order:
-<<<<<<< 340836d36fed078a936533ed916696865b93cd5c
 ** ownCloud Android Library
 ** android-support-appcompat-v7-exploded-aar
 ** android-support-design-exploded-aar
@@ -128,23 +115,6 @@ The generated APK file is saved in android/build/outputs/apk as android-debug.ap
 *** libs\android-support-design-exploded-aar, 
 *** owncloud-android-library. 
 *** Add them if needed.
-=======
-  - ownCloud Android Library
-  - android-support-appcompat-v7-exploded-aar
-  - android-support-design-exploded-aar
-  - com-getbase-floatingactionbutton-1-10-0-exploded-aar
-  - owncloud-android
-* If any error on those projects persists, check the project properties. In the 'Android' section, API Level should be
-  * ownCloud Android Library	-> API level 19
-  * android-support-appcompat-v7-exploded-aa -> API level 23
-  * android-support-design-exploded-aa -> API level 23
-  * owncloud-android	-> API level 23 ; in this project, three library projects should appear referred in the bottom of the dialog: 
-    - libs\android-support-appcompat-v7-exploded-aar, 
-    - libs\android-support-design-exploded-aar, 
-    - libs\com-getbase-floatingactionbutton-1-10-0-exploded-aar and 
-    - owncloud-android-library. 
-    - Add them if needed.
->>>>>>> further formatting
 * After those actions you should be good to go. HAVE FUN!