fixed conflicts with master

[meabook] / constants.py

diff --git a/constants.py b/constants.py
index 57af873..686154c 100644 (file)
--- a/constants.py
+++ b/constants.py
@@ -6,3 +6,8 @@ TYPE_FILE = 'f'
 FIELD_TOPLEVEL = 'o'
 FIELD_MIDDLELEVEL = 'ou'
 FIELD_LOWLEVEL = 'cn'
+FIELD_PHONE_HOME = 'homePhone'
+FIELD_PHONE_GENERAL = 'telephoneNumber'
+FIELD_PHONE_INTERNAL = 'internalPhone'
+FIELD_PHONE_MOBILE = 'mobile'
+FIELD_IMAGE = 'image'