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

Skip to content
Commit a87abbad authored by Jon Miranda's avatar Jon Miranda
Browse files

resolve merge conflicts of 1bd96b1e to ub-launcher3-qt-future-dev 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ide6c914d4e69eb4fa70d6634780324cd45a21610
parents 72fddba8 1bd96b1e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment