Skip to content

R
riscv-gcc-1
Commit eb30a375 by Mark Mitchell
Options

Remove conflict marker. 

From-SVN: r25923
parent fe9b4957
Showing with 0 additions and 1 deletions
gcc/cp/ChangeLog
......@@ -65,7 +65,6 @@
* decl.c (start_function): Suppress normal linkage heuristics
for #pragma interface under MULTIPLE_SYMBOL_SPACES.
>>>>>>> 1.947
1999-03-19 Alexandre Oliva <oliva@dcc.unicamp.br>
* Make-lang.in: ($(INTL_TARGETS)): depend on cp/parse.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment