summaryrefslogtreecommitdiff
path: root/sc/source/ui/vba/vbahelper.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/vba/vbahelper.cxx')
-rw-r--r--sc/source/ui/vba/vbahelper.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index ec34f4b70..f68ffb527 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -826,3 +826,5 @@ ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj )
} // openoffice
} //org
+=======
+>>>>>>> other