9 lines
332 B
Text
9 lines
332 B
Text
|
[[!comment format=mdwn
|
||
|
|
username="https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc"
|
||
|
|
nickname="Matthias"
|
||
|
|
subject="auto conflict resolution"
|
||
|
|
date="2014-04-19T17:26:11Z"
|
||
|
|
content="""
|
||
|
|
Thanks Joey, I could construct a scenario where the auto-conflict-resolution was applied in the master branch.
|
||
|
|
"""]]
|