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

Skip to content
Commit 52122413 authored by Tony Wickham's avatar Tony Wickham
Browse files

resolve merge conflicts of 5c229885 to ub-launcher3-qt-future-dev 

Bug: None
Test: I solemnly swear I tested this conflict resolution.

Change-Id: I41247ff46308b72158731e4a47466533d42e67c6
parents 912206c1 5c229885
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