GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
2311 changed files with 44974 additions and 26547 deletions

View File

@ -52,10 +52,5 @@ snGradSchemes
default limited corrected 0.333;
}
fluxRequired
{
default no;
p_rgh;
}
// ************************************************************************* //

View File

@ -38,9 +38,5 @@ snGradSchemes
{
}
fluxRequired
{
}
// ************************************************************************* //

View File

@ -45,9 +45,5 @@ snGradSchemes
default limited corrected 0.333;
}
fluxRequired
{
default no;
}
// ************************************************************************* //

View File

@ -45,9 +45,5 @@ snGradSchemes
default limited corrected 0.333;
}
fluxRequired
{
default no;
}
// ************************************************************************* //

View File

@ -45,9 +45,5 @@ snGradSchemes
default limited corrected 0.333;
}
fluxRequired
{
default no;
}
// ************************************************************************* //

View File

@ -52,10 +52,5 @@ snGradSchemes
default limited corrected 0.333;
}
fluxRequired
{
default no;
p_rgh;
}
// ************************************************************************* //