Rudder

After merging 2.10 into 2.11, especially the change for #4903, a wrong merge has broken rudder-agent's spec file ( commit:f42d95623c4ef506a124ca327136d48306979761 )

@@@ -718,13 -614,8 +725,18 @@@ rm -f %{_builddir}/file.list.%{name
  # Files from %{rudderdir} and %{ruddervardir} are automatically added via the -f option
  %files -n rudder-agent -f %{_builddir}/file.list.%{name}
  %defattr(-, root, root, 0755)
++<<<<<<< HEAD
 +
 +# The following file is declared to belong to this package but will not be installed
 +# This is because it is populated during post-inst scriptlet
 +# This is not reflected in debian packaging, because dpkg will never replace an
 +# existing file declared in conffiles
 +%ghost %{rudderdir}/etc/uuid.hive
 +
++=======
+ %config(noreplace) %{rudderdir}/etc/uuid.hive
+ %{rudderdir}/share/man
++>>>>>>> branches/rudder/2.10
  %if "%{?_os}" != "aix" 
  /etc/profile.d/rudder-agent.sh
  /etc/init.d/rudder-agent

It needs to be corrected !