fix conflict

diff --cc iptables.spec
index aaf5d03,eddd493..a12efdd
--- 1/iptables.spec
--- 2/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}}