[rpmrebuild/el6: 12/12] BZ 1031101

[Anderson de Farias Silva]

commit 0314b4d84eb22d39ad5ba782d210bec7e99d44d6
Merge: 412f87d 437f04f
Author: Anderson Silva <ansilva at redhat.com>
Date:   Sat Jan 10 08:52:31 2015 -0500

    BZ 1031101

 .gitignore      |    7 +++++++
 rpmrebuild.spec |   12 +++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 7aa471a,b334f85..3bc983c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,8 @@@
++<<<<<<< HEAD
++=======
+ rpmrebuild-2.3.tar.gz
+ /rpmrebuild-2.6.tar.gz
+ /rpmrebuild-2.8.tar.gz
+ /rpmrebuild-2.9.tar.gz
++>>>>>>> master
  /rpmrebuild-2.11.tar.gz