From 7fffa90871b824959c42142d7a55849887914763 Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Sat, 3 May 2014 06:21:40 -0700
Subject: [PATCH] Readme merge fail

---
 README.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/README.md b/README.md
index 1f2568798..0b1188f60 100755
--- a/README.md
+++ b/README.md
@@ -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.