Fixed conflicts after merge with master

Browse Source

...

This commit is contained in:

Enrico Turri

2019-02-22 10:18:15 +01:00

parent aa9994fa35 eb0b3aea09

commit a36896e4c9

38 changed files with 6382 additions and 1018 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

1

resources/icons/bed/mk2.svg Normal file

File diff suppressed because one or more lines are too long

Side by Side After Width:  |  Height:  |  Size: 61 KiB

1

resources/icons/bed/mk3.svg Normal file

File diff suppressed because one or more lines are too long

Side by Side After Width:  |  Height:  |  Size: 61 KiB

1

resources/icons/bed/sl1.svg Normal file

File diff suppressed because one or more lines are too long

Side by Side After Width:  |  Height:  |  Size: 9.2 KiB