resolve merge conflicts

Browse source

...

This commit is contained in:

prateek banga 2023-08-09 14:20:28 +05:30

parent f6d7449dd5 0d7597c4e2

commit 426c315927

4 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

BIN

public/images/vcs/animation-building.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 458 KiB

BIN

public/images/vcs/state-failed.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

public/images/vcs/state-success.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 3.5 KiB

BIN

public/images/vcs/state-waiting.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.8 KiB