skull

README.md

@@ -27,29 +27,20 @@ Stop making issues about Linux not being able to connect, we are aware. This inc
 1. Clone this repo with `git clone --recursive https://github.com/palera1n/palera1n && cd palera1n`
 2. Run `./palera1n.sh --tweaks <ios version youre on atm>`
     - \[A10+\] Before running, you **must** disable your passcode
-    - Put you're device in DFU Mode first.
+    - Put your device in DFU Mode before running.
 3. Follow the steps
-    - Right now, getting into DFU is steps for A11, please suppliment the steps for your device
 
 # Repos
 All repos work with the tweaks branch because it uses normal procursus and not rootless.
 
 # Credits
-- [Nathan](https://github.com/verygenericname) for a lot of the code from SSHRD_Script
+- [Nathan](https://github.com/verygenericname)
     - The ramdisk that dumps blobs is a slimmed down version of SSHRD_Script
-<<<<<<< HEAD
-    - Also helped Mineek getting the kernel up and running and with the patches.
-- [Mineek](https://github.com/mineek) for the patching and booting commands, and adding tweak support.
-||||||| 554eb0d
-    - They also helped me ( mineek ) getting the kernel up and running and with the patches.
-- [Mineek](https://github.com/mineek) for the patching and booting commands, and adding tweak support.
-=======
-    - They also helped me ( mineek ) getting the kernel up and running and with the patches.
-    - Helping with adding multiple device support.
+    - Also helped Mineek getting the kernel up and running and with the patches
+    - Helping with adding multiple device support
 - [Mineek](https://github.com/mineek)
-    - for the patching and booting commands
-    - adding tweak support.
->>>>>>> 88c9f50f60efafbccb50c7995f94d9971532d0f8
+    - For the patching and booting commands
+    - Adding tweak support
 - [Amy](https://github.com/elihwyma) for the Pogo app
 - [nyuszika7h](https://github.com/nyuszika7h) for the script to help get into DFU
 - [the Procursus Team](https://github.com/ProcursusTeam) for the amazing bootstrap