removed leftover line after merging
This commit is contained in:
parent
c0618c3245
commit
12f3e5af3a
@ -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)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user