conflicts resolved
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 322c3ec..d579669 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -307,18 +307,31 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+<<<<<<< HEAD
"fieldname": "credit_days_based_on",
"fieldtype": "Select",
+=======
+ "depends_on": "eval:doc.credit_days_based_on == 'Fixed Days'",
+ "fieldname": "credit_days",
+ "fieldtype": "Int",
+>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
+<<<<<<< HEAD
"label": "Credit Days Based On",
"length": 0,
"no_copy": 0,
"options": "\nFixed Days\nLast Day of the Next Month",
"permlevel": 0,
"precision": "",
+=======
+ "label": "Credit Days",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
@@ -332,16 +345,30 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+<<<<<<< HEAD
"depends_on": "eval:doc.credit_days_based_on == 'Fixed Days'",
"fieldname": "credit_days",
"fieldtype": "Int",
+=======
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "address_contacts",
+ "fieldtype": "Section Break",
+>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
+<<<<<<< HEAD
"label": "Credit Days",
"length": 0,
"no_copy": 0,
+=======
+ "label": "Address and Contacts",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "options": "icon-map-marker",
+>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -356,6 +383,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+<<<<<<< HEAD
"depends_on": "eval:!doc.__islocal",
"fieldname": "address_contacts",
"fieldtype": "Section Break",
@@ -382,6 +410,8 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+=======
+>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"fieldname": "address_html",
"fieldtype": "HTML",
"hidden": 0,
@@ -608,7 +638,11 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
+<<<<<<< HEAD
"modified": "2016-02-22 16:50:55.710869",
+=======
+ "modified": "2016-02-17 12:28:05.386806",
+>>>>>>> ff321763cf11f306460db22789e31756121dbe67
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",
@@ -760,4 +794,4 @@
"search_fields": "supplier_name, supplier_type",
"sort_order": "ASC",
"title_field": "supplier_name"
-}
\ No newline at end of file
+}
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 58db279..b6dc61b 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -1892,4 +1892,4 @@
"sort_order": "DESC",
"timeline_field": "supplier",
"title_field": "title"
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 346c956..8e4434b 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -1059,4 +1059,4 @@
"search_fields": "customer_name,customer_group,territory",
"sort_order": "ASC",
"title_field": "customer_name"
-}
\ No newline at end of file
+}
diff --git a/erpnext/setup/doctype/translation/translation.json b/erpnext/setup/doctype/translation/translation.json
index baf98e3..98b7f6d 100644
--- a/erpnext/setup/doctype/translation/translation.json
+++ b/erpnext/setup/doctype/translation/translation.json
@@ -172,4 +172,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"title_field": "source_name"
-}
\ No newline at end of file
+}