Hi All,
I'm running into a conflict problem with two of the screenshots, each
one is now in my local copy as 3 different files .BASE, .OTHER and .THIS.
Can someone explain to me how to solve the problem, in both cases, the
.THIS version is the one I wanted to commit.
Thanks in advance,
Sylvie
_______________________________________________
Mailing list: https://launchpad.net/~ubuntu-manual
Post to : [email protected]
Unsubscribe : https://launchpad.net/~ubuntu-manual
More help : https://help.launchpad.net/ListHelp
