Resolved merging conflicts in three files

2022-10-25 14:37:33 -05:00
parent 8c5ebb3942 2b8d6fc4d9
commit e68efc039f
3673 changed files with 4374 additions and 4077 deletions
--- a/unittest/fortran/keepstuff.f90
+++ b/unittest/fortran/keepstuff.f90
@ -1,8 +1,8 @@
 MODULE keepstuff
  USE LIBLAMMPS
  IMPLICIT NONE
-  TYPE(LAMMPS) :: lmp
-  INTEGER :: mycomm
+  TYPE(LAMMPS), SAVE :: lmp
+  INTEGER, SAVE :: mycomm
  CHARACTER(LEN=40), DIMENSION(3), PARAMETER :: demo_input = &
      [ CHARACTER(LEN=40) ::                                &
      'region       box block 0 $x 0 2 0 2',                &