commit 1ebc3ecd8f773d41c1a71c60eae069561d71d8b0
Author: Mads Kiilerich <mads(a)kiilerich.com>
Date: Sun Sep 30 23:38:38 2012 +0200
Fix merge conflict markers
freerdp.spec | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/freerdp.spec b/freerdp.spec
index 4cd9543..f368ba2 100644
--- a/freerdp.spec
+++ b/freerdp.spec
@@ -1,10 +1,6 @@
Name: freerdp
Version: 1.0.1
-<<<<<<< HEAD
-Release: 3%{?dist}
-=======
Release: 7%{?dist}
->>>>>>> el6
Summary: Remote Desktop Protocol client
Group: Applications/Communications
Show replies by date