resolve local conflict (45db8fa4) · Commits · Development / openfoam · GitLab

Snippets Groups Projects

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.

Commit 45db8fa4 authored 14 years ago by

Andrew Heather

resolve local conflict

parents ad18857c 1c1c6df6

Hide whitespace changes

Inline Side-by-side

Showing with 181 additions and 351 deletions

Please register or to comment