Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Readme merge fail

Browse Source
This commit is contained in:
Zixaphir 2014-05-03 06:21:40 -07:00
parent c04c83f915
commit 7fffa90871
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -1,11 +1,4 @@
<<<<<<< HEAD
# Get Appchan X [HERE](http://zixaphir.github.io/appchan-x/).
=======
Fork of [Spittie's 4chan X](https://github.com/Spittie/4chan-x) (itself a fork of [Seaweed's](https://github.com/seaweedchan/4chan-x)).
Note: If you're looking for a maintained fork of OneeChan, try
https://github.com/Nebukazar/OneeChan
>>>>>>> v3
1. Make sure both your **browser** and **Appchan X** are up to date.
2. Disable your other extensions & scripts to identify conflicts.