commit d2861df9394c0c5de41bd76686c424df658c8dff
author Nabin Hait <nabinhait@gmail.com> Sun Apr 15 15:03:54 2018 +0530
committer Shreya <shreyashah115@gmail.com> Wed May 02 14:34:14 2018 +0530
tree ae29d30c8a25d16353743b113d508363ef73b6a2
parent 43274de5df456a760b5a0137fa4669eba2d2eb5e

Renamed Health Insurance to Employee Health Insurance

erpnext/hr/doctype/employee/employee.json

diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index ecbb29f..ef2c75d 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -2766,11 +2766,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
-<<<<<<< HEAD
  "modified": "2018-04-25 09:08:06.852604", 
-=======
- "modified": "2018-04-14 13:30:43.761434", 
->>>>>>> Removed employee table from Salary Structure and added employee name in all forms
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee",