Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit c7083840 authored by vadimt's avatar vadimt
Browse files

resolve merge conflicts of a24ed726 to ub-launcher3-qt-future-dev

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I89f3bcf309b10a359b12167474fcb3f93640787f
parents bf7371e5 a24ed726
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment