Skip to content

Commit

Permalink
Merge pull request #162 from LabSid-USP/doc/158-update-licenses-with-…
Browse files Browse the repository at this point in the history
…the-latest-information

Update copyright information in LICENSE file
  • Loading branch information
soaressgabriel committed Feb 29, 2024
2 parents 7c4cf40 + 4939656 commit e4d675a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 93 deletions.
84 changes: 0 additions & 84 deletions COPYING.md

This file was deleted.

13 changes: 4 additions & 9 deletions LICENSE
Expand Up @@ -631,9 +631,8 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

RUBEM is a distributed hydrological model to calculate monthly flows
with changes in land use over time.
Copyright (C) 2020-2024 LabSid PHA EPUSP
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -653,11 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

<<<<<<< HEAD:LICENSE.md
RUBEM Copyright (C) 2020-2024 LabSid PHA EPUSP
=======
RUBEM Copyright (C) 2020-2021 LabSid-PHA-EPUSP
>>>>>>> 75-update-datasets-download-links-on-the-doc-pages:LICENSE
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand All @@ -676,4 +671,4 @@ into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.
<https://www.gnu.org/licenses/why-not-lgpl.html>.

0 comments on commit e4d675a

Please sign in to comment.