From 35f5a685f67a583daeb970d6a41e3ff3b3f29b75 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Fri, 22 Jun 2018 08:17:32 -0400 Subject: [PATCH] small change to preempt a possible merge conflict --- src/Purge.list | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Purge.list b/src/Purge.list index 76c31a86ed..145b4f284c 100644 --- a/src/Purge.list +++ b/src/Purge.list @@ -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