fix merge error

2025-12-08 06:37:44 +00:00 · 2016-09-12 13:55:14 +02:00
parent 2477d40f7b
commit 82eaa3047c
1 changed files with 0 additions and 4 deletions
--- a/tutorials/cfdemSolverRhoPimpleChem/Particle_in_Duct/CFD/0/p
+++ b/tutorials/cfdemSolverRhoPimpleChem/Particle_in_Duct/CFD/0/p
@ -41,11 +41,7 @@ boundaryField
    outlet
    {
        type            fixedValue;
-<<<<<<< HEAD
        value           uniform 101325;
-=======
-        value           $internalField;
->>>>>>> 88f858a366a36749b31c01ce4faa0a27a30bf5dc
    }
 }