Resolving merge conflicts, updating URLs

2021-05-05 11:19:44 -06:00
parent 350ec7cc07 2b33bafbc9
commit f12f9166a5
2266 changed files with 39556 additions and 6567 deletions
--- a/src/npair_half_multi_old_newton.cpp
+++ b/src/npair_half_multi_old_newton.cpp
@ -12,13 +12,14 @@
 ------------------------------------------------------------------------- */

 #include "npair_half_multi_old_newton.h"
-#include "neigh_list.h"
+
 #include "atom.h"
 #include "atom_vec.h"
-#include "molecule.h"
 #include "domain.h"
-#include "my_page.h"
 #include "error.h"
+#include "molecule.h"
+#include "my_page.h"
+#include "neigh_list.h"

 using namespace LAMMPS_NS;