[Tails-dev] Automatically resolving merge conflicts in confi…

ThreadAuthorDate ()
Mintrigeri