From patchwork Tue Oct 8 10:46:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 1173176 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-510457-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="OH9SOJcS"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46nYtZ1r26z9sN1 for ; Tue, 8 Oct 2019 21:46:30 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=EpcNYJKLdUdJlO4M S8wTYTh1zsSIq4/8XeCUdFCWk2LfY3rY9B/zp7sjuKXwXIiyLgt1PeHeAdVVOVHa Vy/Ys7ReqPaTtmqySGvuoEstIXDOo7U2C7E8h6vyDp1wEKxd6/YnVOkGuNkay7ff bdIf0fCEbI5eW9Eh1Oq1nynIvU4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type :content-transfer-encoding; s=default; bh=M04sFcgFvibn0WFyKVHqG3 cBipg=; b=OH9SOJcSUqEZcAxZ0ZP+RHUnmT/GclA/fbGegqYcjzgqHRij3Yv+F6 bYnTkX9PMnynFHUyJUpNKgvnifg8Z04ja3UQBX02pG147tfnfU+h0xwMj+SPmvjL 325mau07vrNFR9WELNncf8Gbwj4+UXWgb8wppM9h1oBlixJnqLB2k= Received: (qmail 18444 invoked by alias); 8 Oct 2019 10:46:22 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 18417 invoked by uid 89); 8 Oct 2019 10:46:21 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: esa4.mentor.iphmx.com Received: from esa4.mentor.iphmx.com (HELO esa4.mentor.iphmx.com) (68.232.137.252) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 08 Oct 2019 10:46:19 +0000 IronPort-SDR: 9OF+6EsQKLiKMM/MRcMArHx2CbnZ6D9FeMDbAGAscFscdGIBowGmB4zM/UHEZwnZxCEckw6TDZ LI+lGDpcmT6utbQ04LBfxY+zTH24NrZhNQftOOHpIGQrURhi+bOXI4MWZZuqt3SDjf4x9udAU9 k+1xhxhOYqiaoQLW4Ctd8jr7GbCas7e18Sody+O+a4oBuh8iRjtHVljh7BadZRshuYpiixhPK7 JFR3NksJd5i9E5tBLv15vgV6VvbWhvZjBThDPpdcnXrPPU0M2A5VGYCQKbw8S1+sjmyTQfg1wi cMA= Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 08 Oct 2019 02:46:18 -0800 IronPort-SDR: FAFRyQv0MBDHzW/ywk0HlALPXwv+lsDYNl/JybSnnmrG7GWr5xB7N/nz/6k8bj2I82VRFU6tfP eynQ3vTCmzsUX8tCfcGd+5oqoEaj/ZYvLAMhVA8dEvKNJdCNvFZELpIRhUSDk3qVsGLhTe0Aj/ sZASc/nO+ud72E1bvDXgLyheEeKpZZU0RQwwNwY7S9LvW48b3yAx4wuZOJ7YC7ypgQoccBJ/sh WNbVQFbQErTqG2y0l5PZqzZvECWAwjBPcBD+axHLj/Pq8Zit5UZSifoqZ8BdulLaShYsON+kKu RSQ= To: gcc-patches From: Tobias Burnus Subject: [patch,commit] Remove ">>>>>> .r..." from a ChangeLog Message-ID: <2c66acc1-8f2e-8486-e374-676c73550b8e@codesourcery.com> Date: Tue, 8 Oct 2019 12:46:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 MIME-Version: 1.0 X-IsSubscribed: yes commit 4958da0be3f08d5f715dc4b74a8e93db18ca1a9e Author: burnus Date: Tue Oct 8 09:35:56 2019 +0000 Remove '>>>' merge marker from changelog git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@276689 138bc75d-0d04-0410-961f-82ee72b054a4 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 84ee818a49d..6e98130dd96 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -153,7 +153,6 @@ (lang_decl): Add new optional_arg field. (GFC_DECL_OPTIONAL_ARGUMENT): New macro. ->>>>>>> .r276463 2019-10-01 David Malcolm * error.c (gfc_diagnostic_starter): Clear the prefix before