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

Commit 92f501ae authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Use 'ours' conflict resolution strategy. 

We should never use anything from finalization commits.

Bug: 243966946
Test: run locally
Change-Id: I4b0cedd7e82362cc98961e627d0103cfba18fc6d
parent ac60bcda
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