[remmina/f21] Fix merge errors

[Simone Caronni]

commit bd4eebca3f676cee25c608984184bbbc9eb2a50b
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Oct 21 16:33:52 2014 +0200

    Fix merge errors

 remmina.spec |    3 ---
 sources      |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/remmina.spec b/remmina.spec
index fec42c6..6510d73 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -13,8 +13,6 @@ License:        GPLv2+ and MIT
 URL:            http://remmina.sourceforge.net
 # VCS: git:https://github.com/FreeRDP/Remmina.git
 Source0:        https://github.com/FreeRDP/Remmina/archive/%{commit}/Remmina-%{commit}.tar.gz
-# https://github.com/FreeRDP/Remmina/issues/228
-Patch0:         %{name}-rfx_context_new.patch
 
 # Cmake helper file to easy build plugins outside remmina sourse tree
 # See http://www.muflone.com/remmina-plugin-rdesktop/english/install.html which
@@ -149,7 +147,6 @@ client.
 
 %prep
 %setup -qn Remmina-%{commit}
-%patch0 -p1
 
 %patch0 -p1 -b .rfx_context_new
 
diff --git a/sources b/sources
index 10c2c9f..e34d0d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-777bfceeb66be43779e53e87ce8d3f8b Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b.tar.gz
+777bfceeb66be43779e53e87ce8d3f8b  Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b.tar.gz