resyncing to master

1 files changed, 7 insertions, 0 deletions

diff --git a/oovbaapi/ooo/vba/office/MsoSyncConflictResolutionType.idl b/oovbaapi/ooo/vba/office/MsoSyncConflictResolutionType.idl
new file mode 100644
index 000000000000..53e75fbb01c6
--- /dev/null
+++ b/oovbaapi/ooo/vba/office/MsoSyncConflictResolutionType.idl
@@ -0,0 +1,7 @@
+module ooo { module vba { module office {
+    constants MsoSyncConflictResolutionType {
+        const long msoSyncConflictClientWins = 0;
+        const long msoSyncConflictMerge = 2;
+        const long msoSyncConflictServerWins = 1;
+    };
+}; }; };