diff options
author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-05-01 22:36:45 +0100 |
---|---|---|
committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-05-01 22:36:45 +0100 |
commit | df878cc2dc80ea09e09617949869ab7044d3c3c3 (patch) | |
tree | 4ffb0d73d6e6b3403d01923b94b27628f566398e /reproduce/software/shell/bashrc.sh | |
parent | a6f5fcd6177b8f6319ffccddda1627f8b1dad415 (diff) | |
parent | 82666074e0c921e53c21b9e2c444e9a2d407d092 (diff) |
Imported recent changes in Maneage, minor conflicts fixed
A few small conflicts showed up here and there. They are fixed with this
merge.
Diffstat (limited to 'reproduce/software/shell/bashrc.sh')
-rwxr-xr-x | reproduce/software/shell/bashrc.sh | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/reproduce/software/shell/bashrc.sh b/reproduce/software/shell/bashrc.sh index b2a151f..69bbba6 100755 --- a/reproduce/software/shell/bashrc.sh +++ b/reproduce/software/shell/bashrc.sh @@ -31,15 +31,12 @@ # # Copyright (C) 2019-2020 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 -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This script is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# A copy of the GNU General Public License is available at -# <http://www.gnu.org/licenses/>. +# This script is part of Maneage. Maneage is free software: you can +# redistribute it and/or modify it under the terms of the GNU General +# Public License as published by the Free Software Foundation, either +# version 3 of the License, or (at your option) any later version. +# +# Maneage is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. See <http://www.gnu.org/licenses/>. |