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

FilAuteurDate ()
Mintrigeri