From cd6ff896a808ce425443e20d2570e8b96a23f7fa Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Mon, 3 May 2021 13:54:12 +0530
Subject: [PATCH] fix: Resolve conflicts

---
 frappe/translate.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/frappe/translate.py b/frappe/translate.py
index 39b5e5239c..85619a3a6a 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -444,25 +444,11 @@ def get_messages_from_report(name):
 		frappe.db.get_value("DocType", report.ref_doctype, "module"))
 
 	if report.columns:
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> bf4a73c3d4... fix: translate report filter labels
-		messages.extend([(None, report_column.label) for report_column in report.columns])
-=======
 		context = "Column of report '%s'" % report.name # context has to match context in `prepare_columns` in query_report.js
 		messages.extend([(None, report_column.label, context) for report_column in report.columns])
->>>>>>> 6250c4ac9d... fix: add context to filter columns
 
 	if report.filters:
 		messages.extend([(None, report_filter.label) for report_filter in report.filters])
-<<<<<<< HEAD
-=======
-		messages.extend([(None, column.label) for column in report.columns])
->>>>>>> f84aee8abe... fix: translate report column labels
-=======
->>>>>>> bf4a73c3d4... fix: translate report filter labels
 
 	if report.query:
 		messages.extend([(None, message) for message in re.findall('"([^:,^"]*):', report.query) if is_translatable(message)])