Merge conflict \o/
Text conflict in po/com.ubuntu.weather.pot 1 conflicts encountered. bzr: ERROR: Conflicts from merge
« Back to merge proposal
Merge conflict \o/
Text conflict in po/com. ubuntu. weather. pot
1 conflicts encountered.
bzr: ERROR: Conflicts from merge