fixing merge conflicts, update to master

2021-06-02 12:33:37 -06:00
parent 77f009126a 96ac2dc9f6
commit 80f28e7fa9
3621 changed files with 43240 additions and 26993 deletions
--- a/src/dump.cpp
+++ b/src/dump.cpp
@ -1,6 +1,7 @@
+// clang-format off
 /* ----------------------------------------------------------------------
   LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
-   https://lammps.sandia.gov/, Sandia National Laboratories
+   https://www.lammps.org/, Sandia National Laboratories
   Steve Plimpton, sjplimp@sandia.gov

   Copyright (2003) Sandia Corporation.  Under the terms of Contract