GIT: Resolve conflict

This commit is contained in:
andy
2011-08-16 16:09:56 +01:00
8696 changed files with 9494 additions and 9534 deletions

View File

@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# License
@ -26,7 +26,7 @@
# foamGraphExecTime
#
# Description
#
#
#------------------------------------------------------------------------------
if (! -f "$1" ) then
echo "No file: '$1'"
@ -44,7 +44,7 @@ cat << EOF > executionTime.dat
Solver Performance
iterations
time/iteration
0 0
0 0
0 0
1
EOF