diff options
| author | Xin Li <delphij@google.com> | 2019-06-10 14:59:23 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-06-10 15:41:00 -0700 |
| commit | b9ccb069f0ea7c53100437deef2280606da568b3 (patch) | |
| tree | fc32272c1ba6df610ea0affed725b7552e8f82be | |
| parent | 8c05cb36921857a51e4aa3b3b45c28a53ae10f85 (diff) | |
| download | tagsoup-b9ccb069f0ea7c53100437deef2280606da568b3.tar.gz | |
Make license block consistent with the whole package.
On Mon, Jun 10, 2019 at 2:58 PM John Cowan <cowan@ccil.org> wrote:
>
> Yes, you can do that. It's part of the test infrastructure, so I probably forgot to change the license.
>
> On Mon, Jun 10, 2019 at 5:44 PM Xin Li <delphij@google.com> wrote:
>>
>> Hi, John,
>>
>> We recently noticed that the license header on PYXScanner.java (part of TagSoup) contained a section saying it's licensed under GPL 2.0+ / Academic Free License in addition to the normal Apache 2.0 license header above it:
>>
>> // 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
>> // the Free Software Foundation; either version 2 of the License, or
>> // (at your option) any later version. You may also distribute
>> // and/or modify it under version 2.1 of the Academic Free License.
>> //
>> // This program 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.
>>
>> May we have permission from you to remove the above block from the file (see attachment) to make it match the other files in the same package?
>>
>> Thanks in advance!
>>
>> Regards,
>>
Change-Id: I86ead2ef1511d2cc7ca8b636dd8e1b5c622da39b
| -rw-r--r-- | src/org/ccil/cowan/tagsoup/PYXScanner.java | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/org/ccil/cowan/tagsoup/PYXScanner.java b/src/org/ccil/cowan/tagsoup/PYXScanner.java index ebfba26..af04ae6 100644 --- a/src/org/ccil/cowan/tagsoup/PYXScanner.java +++ b/src/org/ccil/cowan/tagsoup/PYXScanner.java @@ -12,19 +12,6 @@ // of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // // -// This file is part of TagSoup. -// -// 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 -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. You may also distribute -// and/or modify it under version 2.1 of the Academic Free License. -// -// This program 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. -// -// // PYX Scanner package org.ccil.cowan.tagsoup; |