removed leftover line after merging

This commit is contained in:
Matthias Runge 2015-06-22 11:08:46 +02:00
parent c0618c3245
commit 12f3e5af3a

View File

@ -111,7 +111,6 @@ nosetests-3.4
%changelog
<<<<<<< HEAD
* Mon Jun 22 2015 Matthias Runge <mrunge@redhat.com> - 0.12.0-1
- update to 0.12.0 (rhbz#1234253)