Do you mind reverting,
203 - city_name = self.add_local_world_city() 204 + self.add_local_world_city()
Since I did this in my MP https://code.launchpad.net/~nik90/ubuntu-clock-app/reorganise-clock-tests/+merge/208686. This way I wouldn't have to deal with conflicts ;)
« Back to merge proposal
Do you mind reverting,
203 - city_name = self.add_ local_world_ city() local_world_ city()
204 + self.add_
Since I did this in my MP https:/ /code.launchpad .net/~nik90/ ubuntu- clock-app/ reorganise- clock-tests/ +merge/ 208686. This way I wouldn't have to deal with conflicts ;)