# HG changeset patch
# User anatofuz
# Date 1583048160 -32400
# Node ID 1ccf269e73e832cac36c3ba21fcda97a3f7badae
# Parent  351920fa3827fad2d3ed53100b48ff0b16333e71
remove merge mark

diff -r 351920fa3827 -r 1ccf269e73e8 gcc/c/c-decl.c
--- a/gcc/c/c-decl.c	Sun Mar 01 16:13:28 2020 +0900
+++ b/gcc/c/c-decl.c	Sun Mar 01 16:36:00 2020 +0900
@@ -9139,7 +9139,7 @@
   input_location = saved_loc;
   return enumtype;
 }
->>>>>>> merge rev
+
 
 /* Create the FUNCTION_DECL for a function definition.
    DECLSPECS, DECLARATOR and ATTRIBUTES are the parts of