GIT: Conflict resolution

2025-11-28 03:28:01 +00:00 · 2011-06-08 16:34:27 +01:00
parent 29c485361a 61d21f7622
commit 050bcfafb3
86 changed files with 1180 additions and 2710 deletions
--- a/tutorials/compressible/rhoCentralFoam/Allclean
+++ b/tutorials/compressible/rhoCentralFoam/Allclean
@ -29,7 +29,6 @@ do
    if [ "$caseName" = "biconic25-55Run35" ]
    then
        rm -rf constant/polyMesh/boundary
-        wclean datToFoam
    fi
 )
 done
--- a/tutorials/compressible/rhoCentralFoam/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/Allrun
@ -37,7 +37,6 @@ do
        ;;

    biconic25-55Run35)
-        wmake datToFoam
        runApplication datToFoam grid256.dat

        CONST="constant"