Skip to content

Commit

Permalink
Merge pull request #28 from Heriyadi235/main
Browse files Browse the repository at this point in the history
add vau white livery
  • Loading branch information
Heriyadi235 authored May 3, 2023
2 parents 77f3580 + 7044775 commit 2072be3
Show file tree
Hide file tree
Showing 4 changed files with 2,058 additions and 130 deletions.
2 changes: 1 addition & 1 deletion .gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ tool = unityyamlmerge

[mergetool "unityyamlmerge"]
trustExitCode = false
cmd = 'E:\Unity\2019.4.31f1\Editor\Data\Tools\UnityYAMLMerge.exe' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
cmd = 'D:\Program Files\Unity\Hub\Editor\2019.4.31f1\Editor\Data\Tools\UnityYAMLMerge.exe' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
Loading

0 comments on commit 2072be3

Please # to comment.