From c6a63f4d9fccd88d0fab557f4deb43d6360e4fce Mon Sep 17 00:00:00 2001 From: Tommy Date: Thu, 25 Aug 2022 20:31:45 -0400 Subject: [PATCH] Conflict Fix Signed-off-by: Tommy --- .../os/Choosing Your Android-Based Operating System.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/content/os/Choosing Your Android-Based Operating System.md b/content/os/Choosing Your Android-Based Operating System.md index fb75515..75ef43f 100644 --- a/content/os/Choosing Your Android-Based Operating System.md +++ b/content/os/Choosing Your Android-Based Operating System.md @@ -91,15 +91,7 @@ Currently, Google Pixel phones are the only devices that meet GrapheneOS's [hard ### DivestOS -<<<<<<< HEAD -<<<<<<< HEAD -[DivestOS](https://divestos.org/) is a great aftermarket operating system for devices that have gone end of life or near end of life. Note that this is a harm reduction project, run by one developer on a best effort basis, and you should not buy a new device just to run DivestOS. -======= -DivestOS is a great aftermarket operating system for devices that have gone end-of-life or near end-of-life. Note that this is a harm reduction project, run by one developer on a best effort basis, and you should not buy a new device just to run DivestOS. ->>>>>>> 48b45c6 (Fix grammar in Android page) -======= [DivestOS](https://divestos.org/) is a great aftermarket operating system for devices that have gone end-of-life or are near end-of-life. Note that this is a harm reduction project, ran by one developer on the best effort basis, and you should not buy a new device just to run DivestOS. ->>>>>>> 870634f (Minor fixes) Being a soft-fork of [LineageOS](https://lineageos.org/), DivestOS inherits many [supported devices](https://divestos.org/index.php?page=devices&base=LineageOS) from LineageOS. It has signed builds, making it possible to have [verified boot](https://source.android.com/security/verifiedboot) on some non-Pixel devices.