Mercurial > hg > CbC > CbC_gcc

changeset 147:1ccf269e73e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove merge mark
author anatofuz
date Sun, 01 Mar 2020 16:36:00 +0900
parents 351920fa3827
children 24d2e7cdba67
files gcc/c/c-decl.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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