12943
12977
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
12944
12978
"itself already made a choice, when possible."
12947
12984
#: en/help_topics/conflict-types.txt:41
12949
12986
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
12950
12987
"different ways to resolve the conflict."
12989
"Přesto, ať už Bazaar rozhodl, či nikoliv, existují jisté jednoduché a "
12953
12993
#: en/help_topics/conflict-types.txt:44