fix conflict

Browse Source

...

This commit is contained in:

Jules Parker

2022-03-29 08:59:30 +02:00

parent b5417ede3d f11bae9c74

commit e297cc0bec

3 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

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/images/help/billing/pay-now-button-disabled.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

assets/images/help/billing/pay-now-button.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 13 KiB

BIN

assets/images/help/billing/payment-summary-edit.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 39 KiB After Width:  |  Height:  |  Size: 26 KiB