1 files changed, 19 insertions, 0 deletions
diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi
index bc91e94064a7..3660722c6d4b 100644
--- a/sw/sdi/_docsh.sdi
+++ b/sw/sdi/_docsh.sdi
@@ -121,6 +121,25 @@ interface BaseTextDocument
         StateMethod = GetState ;
     ]
 
+<<<<<<< local
+=======
+    SID_BROWSER_MODE
+    [
+        ExecMethod = Execute;
+        StateMethod = GetState;
+    ]
+
+    FN_PRINT_LAYOUT
+    [
+        ExecMethod = Execute;
+        StateMethod = GetState;
+    ]
+    SID_MAIL_PREPAREEXPORT
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetState;
+    ]
+>>>>>>> other
 }