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

Skip to content
Commit 06792000 authored by Mady Mellor's avatar Mady Mellor
Browse files

resolve merge conflicts of 85224a58 to qt-r1-bubbles-dev 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: If4dbef9cacbcbd8ee5f8c4539a687e4ed754ddff
parents 273632ff 85224a58
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