Commit 82a8d710a26e38bea0d4bb24eed4c83724b61a78
1 parent
4456983a
Exists in
master
and in
2 other branches
esolve merge conflicts
Showing
1 changed file
with
1 additions
and
5 deletions
Show diff stats
GUI/SW1/SRC/resources/License
| 1 | -This file is part of SACAMOS, State of the Art CAble MOdels for Spice. It was developed by the University of Nottingham and the Netherlands Aerospace Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. | 1 | +This file is part of SACAMOS, State of the Art CAble MOdels in Spice. It was developed by the University of Nottingham and the Netherlands Aerospace Centre (NLR) for ESA under contract number 4000112765/14/NL/HK. |
| 2 | 2 | ||
| 3 | -<<<<<<< HEAD | ||
| 4 | -Copyright (C) 2016-2018 University of Nottingham | ||
| 5 | -======= | ||
| 6 | Copyright (C) 2016 - 2018 The University of Nottingham | 3 | Copyright (C) 2016 - 2018 The University of Nottingham |
| 7 | ->>>>>>> v4 | ||
| 8 | 4 | ||
| 9 | SACAMOS 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. | 5 | SACAMOS 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. |
| 10 | 6 |