small change to preempt a possible merge conflict
This commit is contained in:
@ -16,8 +16,11 @@ style_region.h
|
|||||||
style_neigh_bin.h
|
style_neigh_bin.h
|
||||||
style_neigh_pair.h
|
style_neigh_pair.h
|
||||||
style_neigh_stencil.h
|
style_neigh_stencil.h
|
||||||
|
style_nbin.h
|
||||||
|
style_npair.h
|
||||||
|
style_nstencil.h
|
||||||
|
style_ntopo.h
|
||||||
# other auto-generated files
|
# other auto-generated files
|
||||||
lmpcompiledate.h
|
|
||||||
lmpinstalledpkgs.h
|
lmpinstalledpkgs.h
|
||||||
# deleted on 4 April 2018
|
# deleted on 4 April 2018
|
||||||
pair_kim_version.h
|
pair_kim_version.h
|
||||||
|
|||||||
Reference in New Issue
Block a user