fix conflict iptables-1.4.10-0
authorS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 25 Jan 2011 19:47:24 +0000 (14:47 -0500)
committerS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 25 Jan 2011 19:47:24 +0000 (14:47 -0500)
commit369619c33fa68bc2c00cb4504ce60d347a0159c3
tree3c77b8772ea160c7a9f3ab52446ef6120097c0f3
parentf745676a58b0ffaa0858955c894e4979f593db9a
parent5f6b7d1b8faa42457cab15b4b4c2556b3fdf2db0
fix conflict
iptables.spec