[fix] [minor] merge conflict fixed

setup/doctype/sales_person/sales_person.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "modified": "2013-09-02 16:26:54", 
+  "modified": "2013-09-10 10:53:28", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -166,7 +166,8 @@
   "fieldtype": "Table", 
   "hidden": 1, 
   "label": "Communications", 
-  "options": "Communication"
+  "options": "Communication", 
+  "print_hide": 1
  }, 
  {
   "cancel": 0, 

setup/doctype/sms_settings/sms_settings.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "modified": "2013-07-05 14:55:50", 
+  "modified": "2013-09-10 17:20:25", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -35,7 +35,7 @@
   "parenttype": "DocType", 
   "permlevel": 0, 
   "read": 1, 
-  "report": 1, 
+  "report": 0, 
   "role": "System Manager", 
   "submit": 0, 
   "write": 1
@@ -78,7 +78,6 @@
   "doctype": "DocField", 
   "fieldname": "static_parameters", 
   "fieldtype": "Column Break", 
-  "label": "Static Parameters", 
   "width": "50%"
  }, 
  {
@@ -86,7 +85,7 @@
   "doctype": "DocField", 
   "fieldname": "static_parameter_details", 
   "fieldtype": "Table", 
-  "label": "SMS Parameters", 
+  "label": "Static Parameters", 
   "options": "SMS Parameter"
  }, 
  {