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

Skip to content
Unverified Commit 4ddde0f3 authored by Tibor Kaputa's avatar Tibor Kaputa Committed by GitHub
Browse files

Merge pull request #543 from Doubl3MM/master 

adding option keep both in conflicts dialog
parents 0713b488 16ab386e
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