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

Commit 66d91e51 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

resolve merge conflicts of 40dfa3bf to ub-launcher3-master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iee500631827ebc48c63c203fdcd0de888adcb135
parents 57569005 40dfa3bf
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