[rubygem-nokogiri/f16: 22/22] fix merge conflict

[Mamoru Tasaka]

commit f7f82ee52f74e8fb1349550445501f29b829cebe
Merge: e0df5ed 61b5ec3
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Mon Dec 31 17:45:25 2012 +0900

    fix merge conflict

 rubygem-nokogiri-1.5.0.beta3-test-failure.patch |   11 -----------
 rubygem-nokogiri.spec                           |   12 ++++++++++--
 2 files changed, 10 insertions(+), 13 deletions(-)
---