Remove leftover line from git merge

This commit is contained in:
Michel Alexandre Salim
2012-04-05 23:41:16 +07:00
parent 38234d32ab
commit 1d16dec803
-1
View File
@@ -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