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

Skip to content
Commit 87c8a511 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

resolve merge conflicts of f17eb616 to ub-launcher3-qt-r1-dev 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4e177dfb7ba3bde6eb53f63c2f2df273feef90ee
parents 8474ab2b f17eb616
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