From 06324dcf390b361c0bf38c77a23ce0f8d5656dfd Mon Sep 17 00:00:00 2001 From: christos Date: Fri, 3 Apr 2020 17:51:02 +0000 Subject: Resolve conflicts --- external/gpl3/binutils.old/dist/elfcpp/elfcpp_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'external/gpl3/binutils.old/dist/elfcpp/elfcpp_internal.h') diff --git a/external/gpl3/binutils.old/dist/elfcpp/elfcpp_internal.h b/external/gpl3/binutils.old/dist/elfcpp/elfcpp_internal.h index 2aaeeba8a40..a9fc66e8ff9 100644 --- a/external/gpl3/binutils.old/dist/elfcpp/elfcpp_internal.h +++ b/external/gpl3/binutils.old/dist/elfcpp/elfcpp_internal.h @@ -1,6 +1,6 @@ // elfcpp_internal.h -- internals for elfcpp -*- C++ -*- -// Copyright (C) 2006-2016 Free Software Foundation, Inc. +// Copyright (C) 2006-2018 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of elfcpp. -- cgit