[harfbuzz/f20] Fix conflicts in .gitignore

[pnemade]

commit 57bad1083ec7b680e08ec6a74b65fcd9fbfafaf5
Author: Parag Nemade <pnemade at redhat.com>
Date:   Wed Mar 26 11:15:53 2014 +0530

    Fix conflicts in .gitignore

 .gitignore |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 60a301c..36aae86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,9 +21,6 @@
 /harfbuzz-0.9.22.tar.bz2
 /harfbuzz-0.9.23.tar.bz2
 /harfbuzz-0.9.24.tar.bz2
-<<<<<<< HEAD
-=======
 /harfbuzz-0.9.25.tar.bz2
->>>>>>> origin/master
 /harfbuzz-0.9.26.tar.bz2
 /harfbuzz-0.9.27.tar.bz2