[perl-Authen-CAS-Client: 3/3] Typo in last merge

[Nicholas van Oudtshoorn]

commit 14bf960bb73354ee127e5e13cc5ee5fa24d0ff6b
Author: Nicholas van Oudtshoorn <vanoudt at gmail.com>
Date:   Fri May 31 10:13:58 2013 +0800

    Typo in last merge

 perl-Authen-CAS-Client.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/perl-Authen-CAS-Client.spec b/perl-Authen-CAS-Client.spec
index 1cf738b..cab259b 100644
--- a/perl-Authen-CAS-Client.spec
+++ b/perl-Authen-CAS-Client.spec
@@ -46,7 +46,6 @@ make test
 %{_mandir}/man3/*
 
 %changelog
-<<<<<<< HEAD
 * Fri May 31 2013 Nicholas van Oudtshoorn <vanoudt at gmail.com> - 0.06-1
 - New upstream release