Fix merge conflict

This commit is contained in:
Josef Ridky 2018-04-25 09:39:28 +02:00
commit bbd1852b80
2 changed files with 4 additions and 0 deletions

1
.gitignore vendored
View File

@ -19,4 +19,5 @@ babl-0.1.2.tar.bz2
/babl-0.1.38.tar.bz2
/babl-0.1.40.tar.bz2
/babl-0.1.42.tar.bz2
/babl-0.1.44.tar.bz2
/babl-0.1.46.tar.bz2

View File

@ -117,6 +117,9 @@ make check
* Wed Apr 25 2018 Josef Ridky <jridky@redhat.com> - 0.1.46-1
- New upstream release 0.1.46
* Tue Mar 27 2018 Nils Philippsen <nils@tiptoe.de> - 0.1.44-1
- version 0.1.44
* Tue Feb 20 2018 Josef Ridky <jridky@redhat.com> - 0.1.42-4
- add gcc requirement