perl-Text-BibTeX.spec

@@ -1,6 +1,6 @@
 Name:           perl-Text-BibTeX
 Version:        0.85
-Release:        3.0.riscv64%{?dist}
+Release:        2.0.riscv64%{?dist}
 Summary:        Interface to read and parse BibTeX files
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -80,13 +80,9 @@ chrpath -d $RPM_BUILD_ROOT%{_bindir}/*
 %{_libdir}/*.so
 
 %changelog
-<<<<<<< HEAD
-* Sun Jul 15 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 0.85-3.0.riscv64
+* Fri Jun 22 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 0.85-2.0.riscv64
 - Use lib64 for riscv64
 
-* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.85-3
-- Perl 5.28 rebuild
-
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.85-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild