Remove leftover line from git merge
This commit is contained in:
parent
38234d32ab
commit
1d16dec803
1 changed files with 0 additions and 1 deletions
|
|
@ -155,7 +155,6 @@ make test
|
|||
|
||||
|
||||
%changelog
|
||||
<<<<<<< HEAD
|
||||
* Thu Apr 5 2012 Michel Salim <salimma@fedoraproject.org> - 1.0.8-2
|
||||
- BR on texlive-latex for LaTeX tests
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue