Revision: Last Changed Rev: 42523
M       doc/citations/ref.bib
M       samples/2d-tests/globaldisc/phiaver.in
M       samples/backwards-compatible/data/proc0/grid.dat
M       src/Makefile.src
M       src/hydro.f90
M       src/special/backreact_infl.f90
M       src/special/disp_current.f90
C       src/special/gravitational_waves_hTXk.f90
Summary of conflicts:
  Text conflicts: 1