GIT: resolve merge conflict (7e8981b7) · Commits · Development / openfoam · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

openfoam
- Activity
- Members
- Labels
- Releases
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Admin message

Site will likely be offline for maintenance 23/24 April - more details soon

Development
openfoam
Commits
7e8981b7

Commit 7e8981b7 authored 11 years ago by

andy

Downloads
- Patches
- Plain Diff

GIT: resolve merge conflict

parent 4b633ece

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C 1 addition, 1 deletion

...neticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H 1 addition, 1 deletion

...neticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
src/fvOptions/sources/general/codedSource/CodedSource.C 1 addition, 1 deletion

src/fvOptions/sources/general/codedSource/CodedSource.C
src/fvOptions/sources/general/codedSource/CodedSource.H 1 addition, 1 deletion

src/fvOptions/sources/general/codedSource/CodedSource.H

with 4 additions and 4 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment