conflict resolution (a9116624) · Commits · Alice Morris / A Totally True Crime Story · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

A Totally True Crime Story
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

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.

Alice Morris
A Totally True Crime Story
Commits
a9116624

Commit a9116624 authored 5 years ago by

Rhys Jacob

Downloads
- Patches
- Plain Diff

conflict resolution

parent fe68fa59

Branches

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

TTCS_Prot/Assets/CharacterAssets.meta~Stashed changes 8 additions, 0 deletions

TTCS_Prot/Assets/CharacterAssets.meta~Stashed changes
TTCS_Prot/Assets/CharacterAssets.meta~Updated upstream 0 additions, 0 deletions

TTCS_Prot/Assets/CharacterAssets.meta~Updated upstream
TTCS_Prot/Assets/CharacterAssets/Penelope_Idle.png.meta 27 additions, 0 deletions

TTCS_Prot/Assets/CharacterAssets/Penelope_Idle.png.meta
TTCS_Prot/Assets/CharacterAssets/T_Kelso_Happy.png.meta 4 additions, 0 deletions

TTCS_Prot/Assets/CharacterAssets/T_Kelso_Happy.png.meta
TTCS_Prot/Assets/CharacterAssets/T_Kelso_Idle.png.meta 4 additions, 0 deletions

TTCS_Prot/Assets/CharacterAssets/T_Kelso_Idle.png.meta
TTCS_Prot/Assets/CharacterAssets/T_Kelso_Upset.png.meta 4 additions, 0 deletions

TTCS_Prot/Assets/CharacterAssets/T_Kelso_Upset.png.meta
TTCS_Prot/ProjectSettings/TagManager.asset 1 addition, 0 deletions

TTCS_Prot/ProjectSettings/TagManager.asset

with 48 additions and 0 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