Fixed merge conflict

erpnext/patches/v7_0/update_missing_employee_in_timesheet.py

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
+	if frappe.db.table_exists("Time Log"):
 		timesheet = frappe.db.sql("""select tl.employee as employee, ts.name as name,
 				tl.modified as modified, tl.modified_by as modified_by, tl.creation as creation, tl.owner as owner
 			from