Fix merge.
This commit is contained in:
parent
f074fb0dfa
commit
2d531585ad
@ -3,13 +3,9 @@
|
||||
%global syn syn123
|
||||
|
||||
Name: mpg123
|
||||
<<<<<<< HEAD
|
||||
Version: 1.31.3
|
||||
Release: 1%{?dist}
|
||||
=======
|
||||
Version: 1.31.2
|
||||
Release: 2%{?dist}
|
||||
>>>>>>> 0ee0e45443e28f6eb96a65ed22219b1702e8d994
|
||||
|
||||
Summary: Real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3
|
||||
License: LGPLv2+
|
||||
URL: https://mpg123.org
|
||||
|
||||
Loading…
Reference in New Issue
Block a user