diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2009-01-26 07:05:16 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2009-01-26 07:05:16 +0000 |
| commit | 031ae50eaa4dbcd49a5868a2cd0581aa76401ec7 (patch) | |
| tree | 50259ce82c3a54703d79e5e8d91646250f0c561d /setup_native/source | |
| parent | 205348d71c5d5f9fb3166597daac7f5de5c8d84e (diff) | |
#i98425# Merge error: conflict not properly resolved.
Diffstat (limited to 'setup_native/source')
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/exports.dxp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp index 96a3027f2b48..4ac7ff940aef 100644 --- a/setup_native/source/win32/customactions/shellextensions/exports.dxp +++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp @@ -16,9 +16,6 @@ RemoveLayerLinks DotNetCheck ShowProperties copyEditionData -<<<<<<< .working IsOfficeRunning CheckPatchList -======= copyExtensionData ->>>>>>> .merge-right.r266571 |