From 4af3d6cb732fc5cc0b5bfa1c3e382730f3b57d21 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 15 Sep 2017 12:14:22 +0200 Subject: [PATCH] COMP: resolve merge conflict --- .../interFoam/overInterDyMFoam/createDyMControls.H | 5 ----- 1 file changed, 5 deletions(-) diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/createDyMControls.H b/applications/solvers/multiphase/interFoam/overInterDyMFoam/createDyMControls.H index 4864523375..00673cec24 100644 --- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/createDyMControls.H +++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/createDyMControls.H @@ -28,8 +28,3 @@ bool ddtCorr ( pimple.dict().lookupOrDefault("ddtCorr", true) ); - -bool adjustFringe -( - pimple.dict().lookupOrDefault("oversetAdjustPhi", false) -);