merge updates

Author: karissarjacobsen

app/eSignature/views/__init__.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 from ...eg001_embedded_signing import eg001
 from .eg002_signing_via_email import eg002
 from .eg003_list_envelopes import eg003
@@ -43,50 +42,4 @@
 from .eg043_shared_access import eg043
 from .eg044_focused_view import eg044
 from .eg045_delete_restore_envelope import eg045
-=======
-from ...eg001_embedded_signing import eg001
-from .eg002_signing_via_email import eg002
-from .eg003_list_envelopes import eg003
-from .eg004_envelope_info import eg004
-from .eg005_envelope_recipients import eg005
-from .eg006_envelope_docs import eg006
-from .eg007_envelope_get_doc import eg007
-from .eg008_create_template import eg008
-from .eg009_use_template import eg009
-from .eg010_send_binary_docs import eg010
-from .eg011_embedded_sending import eg011
-from .eg012_embedded_console import eg012
-from .eg013_add_doc_to_template import eg013
-from .eg014_collect_payment import eg014
-from .eg015_envelope_tab_data import eg015
-from .eg016_set_tab_values import eg016
-from .eg017_set_template_tab_values import eg017
-from .eg018_envelope_custom_field_data import eg018
-from .eg019_access_code_authentication import eg019
-from .eg020_phone_authentication import eg020
-from .eg022_kba_authentication import eg022
-from .eg023_idv_authentication import eg023
-from .eg024_permissions_creating import eg024
-from .eg025_permissions_set_user_group import eg025
-from .eg026_permissions_change_single_setting import eg026
-from .eg027_permissions_delete import eg027
-from .eg028_brand_creating import eg028
-from .eg029_brands_apply_to_envelope import eg029
-from .eg030_brands_apply_to_template import eg030
-from .eg031_bulk_send import eg031
-from .eg032_pause_signature_workflow import eg032
-from .eg033_unpause_signature_workflow import eg033
-from .eg034_use_conditional_recipients import eg034
-from .eg035_scheduled_sending import eg035
-from .eg036_delayed_routing import eg036
-from .eg037_sms_delivery import eg037
-from .eg038_responsive_signing import eg038
-from .eg039_in_person_signer import eg039
-from .eg040_document_visibility import eg040
-from .eg041_cfr_embedded_signing import eg041
-from .eg042_document_generation import eg042
-from .eg043_shared_access import eg043
-from .eg044_focused_view import eg044
-from .eg045_delete_restore_envelope import eg045
-from .eg046_multiple_delivery import eg046
->>>>>>> d0e48893160382568c4c1dd0c9fc9c5b735c12c7
+from .eg046_multiple_delivery import eg046