[rubygem-gem2rpm/f18] Fix wrongly merged .gitignore.

[Vít Ondruch]

commit e61a27f2cbd17f2bef6246080c4af86abf4c099d
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Apr 23 10:35:56 2013 +0200

    Fix wrongly merged .gitignore.

 .gitignore |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e7edfa0..5dc510c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,7 @@ gem2rpm-0.6.0.gem
 /gem2rpm-0.8.0-tests.tgz
 /gem2rpm-0.8.1-tests.tgz
 /gem2rpm-0.8.1.gem
-<<<<<<< HEAD
-=======
 /gem2rpm-0.9.1-tests.tgz
 /gem2rpm-0.9.1.gem
 /gem2rpm-0.9.2-tests.tgz
 /gem2rpm-0.9.2.gem
->>>>>>> 1c876f7... Update to gem2rpm 0.9.2.