Merge pull request TeamNewPipe/NewPipe#5830 from mhmdanas/remove-outd…

…ated-fdroid-version-note Re-add F-Droid badge and remove outdated note
tossj · Apr 22, 2021 · a5e751a · a5e751a
1 parent 37e1ea6
commit a5e751a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -87,7 +87,11 @@ NewPipe supports multiple services. Our [docs](https://teamnewpipe.github.io/doc
 ## Installation and updates
 You can install NewPipe using one of the following methods:
  1. Add our custom repo to F-Droid and install it from there. The instructions are here: https://newpipe.schabi.org/FAQ/tutorials/install-add-fdroid-repo/
+<<<<<<< HEAD
  2. Download the APK from [Github Releases](https://github.com/TeamNewPipe/NewPipe-legacy/releases) and install it.
+=======
+ 2. Download the APK from [Github Releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it.
+>>>>>>> 80fb351ad... Merge pull request #5830 from mhmdanas/remove-outdated-fdroid-version-note
  3. Update via F-Droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, then push the update to users.
  4. Build a debug APK yourself. This is the fastest way to get new features on your device, but is much more complicated, so we recommend using one of the other methods.