Commit 35f5a685 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

small change to preempt a possible merge conflict

parent 92f0f19d
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ style_region.h
style_neigh_bin.h
style_neigh_pair.h
style_neigh_stencil.h
style_nbin.h
style_npair.h
style_nstencil.h
style_ntopo.h
# other auto-generated files
lmpcompiledate.h
lmpinstalledpkgs.h
# deleted on 4 April 2018
pair_kim_version.h