Manually resolve two rebase conflicts.

2020-09-11 07:39:46 -06:00
parent 50b80e078d
commit 9a5d8fd18b
1217 changed files with 8531 additions and 8531 deletions
--- a/src/compute_slice.cpp
+++ b/src/compute_slice.cpp
@ -34,7 +34,7 @@ enum{COMPUTE,FIX,VARIABLE};

 ComputeSlice::ComputeSlice(LAMMPS *lmp, int narg, char **arg) :
  Compute(lmp, narg, arg),
-  nvalues(0), which(NULL), argindex(NULL), value2index(NULL), ids(NULL)
+  nvalues(0), which(nullptr), argindex(nullptr), value2index(nullptr), ids(nullptr)
 {
  if (narg < 7) error->all(FLERR,"Illegal compute slice command");