vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

chore: remove conflict-marker look-alike

Browse source 
This is annoying when trying to find git conflicts

[skip ci]
This commit is contained in:
Ankush Menat 2023-07-28 11:45:56 +05:30
parent 6e94cd2eb9
commit 22a3a56d44
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/database/database.py
View file

@ -314,7 +314,7 @@ class Database:
if frappe.conf.logging == 2:
_query = _query or str(mogrified_query)
frappe.log(f"<<<< query\n{_query}\n>>>>")
frappe.log(f"#### query\n{_query}\n####")
if unmogrified_query and is_query_type(
unmogrified_query, ("alter", "drop", "create", "truncate", "rename")