mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
GIT: Resolved conflict on merge from upstream
This commit is contained in:
@ -3,7 +3,7 @@
|
||||
<div class="footer">
|
||||
<p>
|
||||
Copyright © 2011-2013
|
||||
<a href="http://www.openfoam.org/about">OpenFOAM Foundation</a>
|
||||
<a href="http://www.openfoam.com/about">OpenFOAM</a>
|
||||
|
|
||||
OPENFOAM® is a registered
|
||||
<a href="http://www.openfoam.com/legal/trademark-policy.php">trademarks
|
||||
|
||||
Reference in New Issue
Block a user