Fixed merge conflict.

ChangeLog

app/cdi.c

app/printinfo.h

doc/pio/tex/intro.tex

doc/tex/c_quick_ref.tex

doc/tex/f_quick_ref.tex

doc/tex/install.tex

examples/cdi_write.c

examples/cdi_write_const.c

examples/cdi_write_dbl.c

examples/cdi_write_ens.c

examples/cdi_write_f.f

examples/cdi_write_f2003.f90

examples/cdi_write_float.c

examples/cdi_write_forecast.c

examples/cdi_write_gribkey.c

examples/cdi_write_hybrid.c

examples/cdi_write_pl.c

examples/cdi_write_point.c

examples/cdi_write_refgrid.c