summaryrefslogtreecommitdiff
path: root/automation
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2009-01-26 07:05:16 +0000
committerRüdiger Timm <rt@openoffice.org>2009-01-26 07:05:16 +0000
commit031ae50eaa4dbcd49a5868a2cd0581aa76401ec7 (patch)
tree50259ce82c3a54703d79e5e8d91646250f0c561d /automation
parent205348d71c5d5f9fb3166597daac7f5de5c8d84e (diff)
#i98425# Merge error: conflict not properly resolved.
Diffstat (limited to 'automation')
0 files changed, 0 insertions, 0 deletions