Review: Needs Fixing

Looks like there is a merge conflict that got committed as-is?

Diff comments:

> diff --git a/tests/check-ubuntu-unity-desktop 
> b/tests/check-ubuntu-unity-desktop
> index 8168a16..0ffc5c0 100755
> --- a/tests/check-ubuntu-unity-desktop
> +++ b/tests/check-ubuntu-unity-desktop
> @@ -1 +1,5 @@
> -dpkg-query -W ubuntu-unity-desktop
> \ No newline at end of file
> +<<<<<<< tests/check-ubuntu-unity-desktop
> +dpkg-query -W ubuntu-unity-desktop
> +=======
> +dpkg-query -W ubuntu-unity-desktop
> +>>>>>>> tests/check-ubuntu-unity-desktop

This looks wrong.



-- 
https://code.launchpad.net/~andersson123/auto-upgrade-testing-specifications/+git/auto-upgrade-testing-specifications/+merge/443687
Your team Canonical Platform QA Team is subscribed to branch 
auto-upgrade-testing-specifications:main.


-- 
Mailing list: https://launchpad.net/~canonical-ubuntu-qa
Post to     : canonical-ubuntu-qa@lists.launchpad.net
Unsubscribe : https://launchpad.net/~canonical-ubuntu-qa
More help   : https://help.launchpad.net/ListHelp

Reply via email to