From 65a3fa3daac30e6dd5b1dd02a85c35e99b0d638d Mon Sep 17 00:00:00 2001
From: Trevor Cooper <tjcooper1982@gmail.com>
Date: Thu, 28 Jun 2012 04:21:49 -0500
Subject: [PATCH] test

---
 README.md |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 84117c4..69c8188 100644
--- a/README.md
+++ b/README.md
@@ -3,4 +3,8 @@ ElvUI_SLE
 
 Shadow & Light Edit (ElvUI Plugin)
 
-By two lazy asses lol :D
\ No newline at end of file
+<<<<<<< HEAD
+By two lazy asses lol :D
+=======
+we be the lazy peeps -Repooc
+>>>>>>> origin/repooc
-- 
1.7.9.5