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

Skip to content
Commit ea2314c8 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

resolve merge conflicts of 07d866a1 to qt-qpr1-sysui-dev 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icfe845572ea5654aae145e771a593cd66eff2305
parents 3e7ce55b 07d866a1
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