remove git merge cruft

This commit is contained in:
Dan Winship 2013-11-11 16:42:16 -05:00
parent ceb5e32aec
commit 95a3836371

View File

@ -297,7 +297,6 @@ make test
%changelog %changelog
=======
* Mon Nov 11 2013 Dan Winship <danw@redhat.com> - 0.4.11-7 * Mon Nov 11 2013 Dan Winship <danw@redhat.com> - 0.4.11-7
- Really fix the JS_AbortIfWrongThread crash (#998232) - Really fix the JS_AbortIfWrongThread crash (#998232)