diff options
Diffstat (limited to 'src/conflict.c')
| -rw-r--r-- | src/conflict.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/conflict.c b/src/conflict.c index 5613ace..83713c5 100644 --- a/src/conflict.c +++ b/src/conflict.c @@ -3,19 +3,8 @@ Written by Jakub Jelinek <jakub@redhat.com>, 2001. Updated by Maciej W. Rozycki <macro@codesourcery.com>, 2008. - 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, or (at your option) - any later version. - - 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. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +* SPDX-License-Identifier: GPL-2.0-or-later +*/ #include <config.h> #include <assert.h> |