← Back to branch summary

~ubuntu-branches/ubuntu/wily/phabricator/wily 

1
2
3
4
5
6
7
8
9
10

{
    "foo": "bar",
<<<<<<< HEAD
    "bar": "baz"
=======
    "baz": "foo"
>>>>>>> branch2
}
~~~~~~~~~~
error:5:1