GIT: resolved merge conflict

This commit is contained in:
andy
2012-08-21 18:17:27 +01:00
72 changed files with 1175 additions and 779 deletions

View File

@ -88,7 +88,7 @@ cleanCase()
rm -rf \
allOwner* cell* face* meshModifiers* \
owner* neighbour* point* edge* \
cellLevel* pointLevel* refinementHistory* level0Edge surfaceIndex* sets \
cellLevel* pointLevel* refinementHistory* level0Edge* surfaceIndex* sets \
> /dev/null 2>&1 \
)
fi