GIT: resolve merge conflict

This commit is contained in:
andy
2012-07-25 09:27:24 +01:00
111 changed files with 2177 additions and 2520 deletions

View File

@ -1,42 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object changeDictionaryDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
{
boundary
{
AMI1
{
type cyclicAMI;
neighbourPatch AMI2;
transform noOrdering;
surface
{
}
}
AMI2
{
type cyclicAMI;
neighbourPatch AMI1;
transform noOrdering;
surface
{
}
}
}
}
// ************************************************************************* //