[wordpress/f18: 14/14] Merge

[Nick Bebout]

commit bb272c60b68b9e889b361b1ad0ea555b4c62d7c5
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Dec 18 20:25:12 2012 -0600

    Merge

 .gitignore |    3 ---
 1 files changed, 0 insertions(+), 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