COMP: resolve merge conflict

This commit is contained in:
Mark Olesen
2017-09-15 12:14:22 +02:00
parent 2a586dcbe2
commit 4af3d6cb73

View File

@ -28,8 +28,3 @@ bool ddtCorr
(
pimple.dict().lookupOrDefault("ddtCorr", true)
);
bool adjustFringe
(
pimple.dict().lookupOrDefault("oversetAdjustPhi", false)
);