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/servers-backup.conf | |
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/servers-backup.conf')
-rw-r--r-- | reproduce/software/config/servers-backup.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/reproduce/software/config/servers-backup.conf b/reproduce/software/config/servers-backup.conf index c2ade5a..8db0ce1 100644 --- a/reproduce/software/config/servers-backup.conf +++ b/reproduce/software/config/servers-backup.conf @@ -3,7 +3,7 @@ # is irrelevant). Note that this is not a to be read as a variable but will # be parsed as a list. # -# Copyright (C) 2020 Mohammad Akhlaghi <mohammad@akhlaghi.org> +# Copyright (C) 2020-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org> # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and |