From bb272c60b68b9e889b361b1ad0ea555b4c62d7c5 Mon Sep 17 00:00:00 2001
From: Nick Bebout <nb@fedoraproject.org>
Date: Tue, 18 Dec 2012 20:25:12 -0600
Subject: [PATCH] Merge

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4d66b47..a7c0e8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 wordpress-3.0.1.tar.gz
 /wordpress-3.0.2.tar.gz
 /wordpress-3.0.3.tar.gz
@@ -35,5 +33,4 @@ wordpress-3.0.1.tar.gz
 /wordpress-3.5-RC1.tar.gz
 /wordpress-3.5-RC2.tar.gz
 /wordpress-3.5-RC3.tar.gz
->>>>>>> master
 /wordpress-3.5.tar.gz