commit ba965fe1cd7bae1b04b1f61775c08b0095f37a4f Author: bioinfornatics bioinfornatics@fedoraproject.org Date: Sat Jan 31 22:54:36 2015 +0100
fix spec
derelict.spec | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) --- diff --git a/derelict.spec b/derelict.spec index 51a5bbe..933059f 100644 --- a/derelict.spec +++ b/derelict.spec @@ -735,15 +735,9 @@ install -p -d %{buildroot}%{_libdir} %add_files -n Vorbis Vorbis vorbis
%changelog -<<<<<<< HEAD -======= -* Sat Jan 31 2015 Jonathan MERCIER bioinfornatics@gmail.com - 3-31.20141022git7fc1714 -- update to latest rev
* Tue Sep 16 2014 bioinfornatics - 3-30.20140710gita786b4b - Update to latest revision - ->>>>>>> 3db3e94... update to latist red * Sat Aug 16 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 3-29.20140422git16940c7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild