From 8f53df91b93107bc3548e68a9d890f9a502e3e11 Mon Sep 17 00:00:00 2001 From: Lyndon Armitage Date: Mon, 24 Sep 2018 10:08:02 +0100 Subject: [PATCH] Delete & Ignore output.txt & error.txt Both output.txt and error.txt are produced by tests. Each file contained a header that was overridden upon executing said tests causing tracked files to be changed. Added them to a local .gitignore file for this module. --- module/.gitignore | 2 ++ module/error.txt | 23 ----------------------- module/output.txt | 23 ----------------------- 3 files changed, 2 insertions(+), 46 deletions(-) create mode 100644 module/.gitignore delete mode 100644 module/error.txt delete mode 100644 module/output.txt diff --git a/module/.gitignore b/module/.gitignore new file mode 100644 index 000000000..ecfa5dd46 --- /dev/null +++ b/module/.gitignore @@ -0,0 +1,2 @@ +error.txt +output.txt diff --git a/module/error.txt b/module/error.txt deleted file mode 100644 index ee28c3c1c..000000000 --- a/module/error.txt +++ /dev/null @@ -1,23 +0,0 @@ -==== - The MIT License - Copyright (c) 2014 Ilkka Seppälä - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. -==== - diff --git a/module/output.txt b/module/output.txt deleted file mode 100644 index ee28c3c1c..000000000 --- a/module/output.txt +++ /dev/null @@ -1,23 +0,0 @@ -==== - The MIT License - Copyright (c) 2014 Ilkka Seppälä - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. -==== - -- GitLab