resolve merge conflicts
This commit is contained in:
commit
23365309bd
@ -110,6 +110,12 @@ fi
|
||||
* Fri Jul 08 2016 Ondrej Vasik <ovasik@redhat.com> - 1.79.1-1
|
||||
- new upstream release 1.79.1
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.78.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.78.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Fri Sep 05 2014 Ondrej Vasik <ovasik@redhat.com> 1.78.1-6
|
||||
- Don't ship Java extensions on Fedora until compiled from
|
||||
sources
|
||||
|
Loading…
Reference in New Issue
Block a user