Fix a merge issue

diff --cc packaging/SDL.spec
index 957edb3,272dd17..7f2fef9
--- 1/packaging/SDL.spec
--- 2/packaging/SDL.spec
+++ b/packaging/SDL.spec
@@@ -9,9 -9,6 +9,7 @@@ Url:            http://www.libsdl.org
  Group:          System/Libraries
  Source:         http://www.libsdl.org/release/SDL-%{version}.tar.gz
  Source2:        baselibs.conf
- # PATCH-FIX-OPENSUSE SDL-1.2.13-x11-keytounicode.patch
- Patch0:         SDL-1.2.13-x11-keytounicode.patch
 +Source1001:   SDL.manifest
  BuildRequires:  autoconf
  BuildRequires:  gcc-c++
  BuildRequires:  libpulse-devel
@@@ -60,8 -57,6 +58,7 @@@ library
  
  %prep
  %setup -q
- %patch0
 +cp %{SOURCE1001} .
  
  # remove the file to provide sufficient evidence that we are
  # not using this file during the build [bnc#508111]