From 8205a4c89d967fb48ec29c3fe6b9469a4d40a17b Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Aug 10 2011 17:15:27 +0000
Subject: Remove a conflict marker# Please enter the commit message for your changes. Lines starting


---

diff --git a/python-chameleon.spec b/python-chameleon.spec
index 9cc13e4..7e5647c 100644
--- a/python-chameleon.spec
+++ b/python-chameleon.spec
@@ -76,7 +76,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-<<<<<<< HEAD
 * Wed Aug 10 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 2.2-1
 - New upstream release