From 14bf960bb73354ee127e5e13cc5ee5fa24d0ff6b Mon Sep 17 00:00:00 2001
From: Nicholas van Oudtshoorn <vanoudt@gmail.com>
Date: May 31 2013 02:13:58 +0000
Subject: Typo in last merge


---

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@gmail.com> - 0.06-1
 - New upstream release