diff --git a/Ajaxterm.spec b/Ajaxterm.spec
index 13a52de..2fa5603 100644
--- a/Ajaxterm.spec
+++ b/Ajaxterm.spec
@@ -115,6 +115,7 @@ fi
 %ghost %attr(0644,root,root) %{_localstatedir}/lock/subsys/ajaxterm
 
 %changelog
+
 * Wed Nov 24 2010 Ruben Kerkhof <ruben@rubenkerkhof.com> 0.10-13
 - %%ghost files in /var/run and /var/lock (#656543)
 
@@ -126,12 +127,10 @@ fi
 - Add a README.Fedora
 - Add an example config for Apache
 
-* Wed Aug 11 2010 David Malcolm <dmalcolm@redhat.com> - 0.10-11
-- recompiling .py files against Python 2.7 (rhbz#623267)
-
 * Wed Aug 11 2010 Ruben Kerkhof <ruben@rubenkerkhof.com> 0.10-10
 - Rebuild for python 2.7
 
+>>>>>>> master
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild