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

Commit fcaff64c authored by Jon Miranda's avatar Jon Miranda
Browse files

Resolve merge conflicts of 8eb0de13 to ub-launcher3-master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I1e888f6941435befe6f1819de74dea985909ddf0
parents bea3a6ba 8eb0de13
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment