aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software/config/software_acknowledge_context.sh
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2021-01-03 15:24:08 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2021-01-03 15:24:08 +0000
commitdaeb41ba00427d28e22169381bc21b1ad784d087 (patch)
tree8a3267559a0f5c8dc63fae16ae2bc65d8ab6715e /reproduce/software/config/software_acknowledge_context.sh
parent281ad23c2218560bcdfe3e76cf61f4901f76b257 (diff)
parentb1bd282bc3bcd11573fc064edfbab1bd65564348 (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/software_acknowledge_context.sh')
-rwxr-xr-xreproduce/software/config/software_acknowledge_context.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/reproduce/software/config/software_acknowledge_context.sh b/reproduce/software/config/software_acknowledge_context.sh
index b0ede85..f1454c0 100755
--- a/reproduce/software/config/software_acknowledge_context.sh
+++ b/reproduce/software/config/software_acknowledge_context.sh
@@ -10,8 +10,8 @@
# your project to make a smoothly readable English text. Afterwards, please
# feel free to modify them as you wish.
#
-# Copyright (C) 2020 Boud Roukema <boud@cosmo.torun.pl>
-# Copyright (C) 2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+# Copyright (C) 2021 Boud Roukema <boud@cosmo.torun.pl>
+# Copyright (C) 2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>
#
# This script is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the