[rubygem-trollop/el6/master: 11/11] updated to 1.16.2 #683059

[Jan Klepek]

commit e68d3e0840af63dd9b19b86008ff7c83a1d2b11f
Merge: 39e7da7 a6c1438
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Thu Mar 10 16:29:50 2011 +0100

    updated to 1.16.2 #683059

 .gitignore           |    4 ++++
 rubygem-trollop.spec |   17 +++++++++++------
 sources              |    4 ++++
 3 files changed, 19 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 0494c76,acf4b2c..8216329
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +trollop-1.15.gem
++=======
+ /trollop-1.16.2.gem
++>>>>>>> el5
diff --cc sources
index 2bcd7ab,357890e..7593bbd
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +359347775ff3166eb13ec80363ad67a1  trollop-1.15.gem
++=======
+ 8e7060748d49647cd9760e99ed745fbc  trollop-1.16.2.gem
++>>>>>>> el5