path: root/doc/forum/What_can_be_done_in_case_of_conflict/comment_2_69ee17959a92bb8359c0fd7b2a9d8dfb._comment

[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ"
 nickname="Royal"
 subject="Resolving conflict"
 date="2012-04-24T03:59:31Z"
 content="""
Hi,
Now I am able to resolve the conflict.
Thank you.
"""]]