[yum-updatesd/f16: 8/8] Fix merge conflict

[James Antill]

On Fri, 2012-02-17 at 18:53 +0000, brummbq wrote:
> commit cdfce81f50cbf73b0e7bfc9f8445750878a7da86
> Author: Gregor Tätzner <gregor at freenet.de>
> Date:   Fri Feb 17 19:52:18 2012 +0100
> 
>     Fix merge conflict
> 
>  yum-updatesd.spec |    8 --------
>  1 files changed, 0 insertions(+), 8 deletions(-)
> ---
> diff --git a/yum-updatesd.spec b/yum-updatesd.spec
> index eec9831..a064d89 100644
> --- a/yum-updatesd.spec
> +++ b/yum-updatesd.spec
> @@ -2,20 +2,15 @@ Summary: Update notification daemon
>  Name: yum-updatesd
>  Epoch: 1
>  Version: 0.9
> -=======
>  Release: 9%{?dist}
> ->>>>>>> master
>  License: GPLv2
>  Group: System Environment/Base
>  Source0: %{name}-%{version}.tar.bz2
>  Source1: %{name}.service
> -<<<<<<< HEAD
> -=======

 This isn't correct ... you need to add the previous entry back and make
this -10, or there will be two different -9 versions.