# Conflicts: # src/DIPOLE/pair_lj_cut_dipole_long.h # src/OPENMP/fix_nvt_sllod_omp.h # src/PHONON/fix_phonon.h # src/SPIN/pair_spin_dipole_cut.h # src/SPIN/pair_spin_dipole_long.h # src/STUBS/mpi.h # src/UEF/fix_nh_uef.h # src/fix_nvt_sllod.h # tools/coding_standard/homepage.py