remove git merge cruft
This commit is contained in:
parent
ceb5e32aec
commit
95a3836371
@ -297,7 +297,6 @@ make test
|
||||
|
||||
|
||||
%changelog
|
||||
=======
|
||||
* Mon Nov 11 2013 Dan Winship <danw@redhat.com> - 0.4.11-7
|
||||
- Really fix the JS_AbortIfWrongThread crash (#998232)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user