diff --git a/.gitignore b/.gitignore index 13eb7dd..1afd06f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ /xnat-0.3.11.tar.gz /xnat-0.3.17.tar.gz /xnat-0.3.18.tar.gz -<<<<<<< HEAD -======= /xnat-0.3.19.tar.gz /xnat-0.3.21.tar.gz diff --git a/python-xnat.spec b/python-xnat.spec index f08a7a1..ff301d4 100644 --- a/python-xnat.spec +++ b/python-xnat.spec @@ -33,7 +33,6 @@ BuildRequires: python3-progressbar2 BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-six -%{?python_provide:%python_provide python3-%{pypi_name}} %description -n python3-%{pypi_name} %{desc}