fix merge conflict

Browse Source

...

This commit is contained in:

sshumakov3

2020-11-16 00:35:17 +03:00

parent 684980c6da

commit bfc0886b46

1 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

resources/Font Awesome 5 Pro-Regular-400.otf

Binary file not shown.