diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-03 15:24:08 +0000 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-03 15:24:08 +0000 |
| commit | daeb41ba00427d28e22169381bc21b1ad784d087 (patch) | |
| tree | 8a3267559a0f5c8dc63fae16ae2bc65d8ab6715e /reproduce/software/config/numpy-scipy.cfg | |
| parent | 281ad23c2218560bcdfe3e76cf61f4901f76b257 (diff) | |
| parent | b1bd282bc3bcd11573fc064edfbab1bd65564348 (diff) | |
Imported recent updates in Maneage, minor conflicts fixed
There were only three very small conflicts that have been fixed.
Diffstat (limited to 'reproduce/software/config/numpy-scipy.cfg')
| -rw-r--r-- | reproduce/software/config/numpy-scipy.cfg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/reproduce/software/config/numpy-scipy.cfg b/reproduce/software/config/numpy-scipy.cfg index 82cc1e1..3a3171e 100644 --- a/reproduce/software/config/numpy-scipy.cfg +++ b/reproduce/software/config/numpy-scipy.cfg @@ -7,8 +7,8 @@ # appropriate sections. Not all packages will use all sections so you # should leave out sections that your package does not use. # -# Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org> -# Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com> +# Copyright (C) 2018-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> +# Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com> # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and |