Fix conflicts

Browse Source

...

This commit is contained in:

John Fawkes

2022-10-10 09:31:27 -04:00

parent 8269f5cc60

commit e245df082a

8 changed files with 198 additions and 73 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

0

anon_fawkes/overlays/images/AppleTVPlus-Round.png → anon_fawkes/overlays/images/AppleTV+-Round.png

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

0

anon_fawkes/overlays/images/AppleTVPlus-Square.png → anon_fawkes/overlays/images/AppleTV+-Square.png

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

0

anon_fawkes/overlays/images/DiscoveryPlus-Square.png → anon_fawkes/overlays/images/Discovery-Round.png

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

0

anon_fawkes/overlays/images/DiscoveryPlus-Round.png → anon_fawkes/overlays/images/Discovery-Square.png

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

BIN

anon_fawkes/overlays/images/STREAMBLANK.png

Binary file not shown.

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