From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Tue, 25 Jan 2011 19:47:24 +0000 (-0500)
Subject: fix conflict
X-Git-Tag: iptables-1.4.10-0^0
X-Git-Url: http://git.onelab.eu/?p=iptables.git;a=commitdiff_plain;h=369619c33fa68bc2c00cb4504ce60d347a0159c3

fix conflict
---

369619c33fa68bc2c00cb4504ce60d347a0159c3
diff --cc iptables.spec
index aaf5d03,eddd493..a12efdd
--- a/iptables.spec
+++ b/iptables.spec
@@@ -1,11 -1,6 +1,6 @@@
- #
- # $Id$
- #
- %define url $URL$
- 
  %define name iptables
 -%define version 1.4.9
 -%define taglevel 1
 +%define version 1.4.10
 +%define taglevel 0
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}