summaryrefslogtreecommitdiff
path: root/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
diff options
context:
space:
mode:
Diffstat (limited to 'wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py')
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index bbf6921d381f..20c32c38045f 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -1,6 +1,10 @@
from common.Resource import Resource
class FaxWizardDialogResources(Resource):
+<<<<<<< HEAD
+=======
+ UNIT_NAME = "dbwizres"
+>>>>>>> master
MODULE_NAME = "dbw"
RID_FAXWIZARDDIALOG_START = 3200
RID_FAXWIZARDCOMMUNICATION_START = 3270