Fix merge conflict.

ChangeLog

app/cdi.c

configure

configure.ac

doc/pio/tex/intro.tex

doc/tex/c_grid.tex

doc/tex/c_quick_ref.tex

doc/tex/c_ref.tex

doc/tex/c_stream_read.tex

doc/tex/c_stream_write.tex

doc/tex/c_vlist_var.tex

doc/tex/cdi_cman.tex

doc/tex/cdi_fman.tex

doc/tex/f_ref.tex

doc/tex/f_vlist_var.tex

doc/tex/install.tex

doc/tex/makedoc

examples/cdi_copy.c

examples/cdi_copy_f.f

examples/cdi_copy_file.c