resolve merge conflicts of 08776ada1e to ub-launcher3-qt-future-dev

Browse Source

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082

...

This commit is contained in:

vadimt

2019-10-03 13:34:28 -07:00

committed by Vadim Tryshev

parent f2a3e79e76

commit a9d870828c

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

Diff Content Not Available