renaissance1: resolved merge conflicts, cleanup.

21 files changed, 0 insertions, 0 deletions

diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index faa752d601df..faa752d601df 100644..100755
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index 3602e711db1b..3602e711db1b 100644..100755
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi
index c63d20c0f5f6..c63d20c0f5f6 100644..100755
--- a/sd/sdi/_docsh.sdi
+++ b/sd/sdi/_docsh.sdi
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 6d0d3ef33ce9..6d0d3ef33ce9 100644..100755
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
diff --git a/sd/sdi/app.sdi b/sd/sdi/app.sdi
index 69df9f364234..69df9f364234 100644..100755
--- a/sd/sdi/app.sdi
+++ b/sd/sdi/app.sdi
diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi
index b69a5bc9c041..b69a5bc9c041 100644..100755
--- a/sd/sdi/docshell.sdi
+++ b/sd/sdi/docshell.sdi
diff --git a/sd/sdi/drbezob.sdi b/sd/sdi/drbezob.sdi
index fc0047240dd3..fc0047240dd3 100644..100755
--- a/sd/sdi/drbezob.sdi
+++ b/sd/sdi/drbezob.sdi
diff --git a/sd/sdi/drgrfob.sdi b/sd/sdi/drgrfob.sdi
index c6b308d58ad4..c6b308d58ad4 100644..100755
--- a/sd/sdi/drgrfob.sdi
+++ b/sd/sdi/drgrfob.sdi
diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi
index f4133f0f4643..f4133f0f4643 100644..100755
--- a/sd/sdi/drtxtob.sdi
+++ b/sd/sdi/drtxtob.sdi
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index 600bbdf19a06..600bbdf19a06 100644..100755
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi
index d033c02b2824..d033c02b2824 100644..100755
--- a/sd/sdi/grdocsh.sdi
+++ b/sd/sdi/grdocsh.sdi
diff --git a/sd/sdi/grviewsh.sdi b/sd/sdi/grviewsh.sdi
index 7fd5b74cb7c0..7fd5b74cb7c0 100644..100755
--- a/sd/sdi/grviewsh.sdi
+++ b/sd/sdi/grviewsh.sdi
diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk
index a950aad5d7a5..a950aad5d7a5 100644..100755
--- a/sd/sdi/makefile.mk
+++ b/sd/sdi/makefile.mk
diff --git a/sd/sdi/mediaob.sdi b/sd/sdi/mediaob.sdi
index 47aa1600a00c..47aa1600a00c 100644..100755
--- a/sd/sdi/mediaob.sdi
+++ b/sd/sdi/mediaob.sdi
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 9639f1adc9dc..9639f1adc9dc 100644..100755
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi
index e52bd8ea59e8..e52bd8ea59e8 100644..100755
--- a/sd/sdi/sdgslots.sdi
+++ b/sd/sdi/sdgslots.sdi
diff --git a/sd/sdi/sdnew.sdi b/sd/sdi/sdnew.sdi
index 2c94a4d59786..2c94a4d59786 100644..100755
--- a/sd/sdi/sdnew.sdi
+++ b/sd/sdi/sdnew.sdi
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 0e91fb2c9134..0e91fb2c9134 100644..100755
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
diff --git a/sd/sdi/sdslots.hrc b/sd/sdi/sdslots.hrc
index 472f794be479..472f794be479 100644..100755
--- a/sd/sdi/sdslots.hrc
+++ b/sd/sdi/sdslots.hrc
diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index fbfc8da1903b..fbfc8da1903b 100644..100755
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi
index 8126df09b75a..8126df09b75a 100644..100755
--- a/sd/sdi/tables.sdi
+++ b/sd/sdi/tables.sdi