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

Skip to content
Commit cf72f259 authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

Fix incorrect merge conflict to klp-modular-dev-plus-aosp 

resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp
properly, originally fixed in 35d46778

Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e
parent 3ee9dc58
Hide 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