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

fix: merge conflicts

Browse source
This commit is contained in:
Aradhya-Tripathi 2021-11-08 12:02:54 +05:30
parent 0b5b234e93
commit a29d7bbd82
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/core/doctype/transaction_log/transaction_log.py
View file

@ -51,13 +51,8 @@ def get_current_index():
.where(series.name == "TRANSACTLOG")
.for_update()
.select("current")
<<<<<<< HEAD
.run()
)
=======
).run()
>>>>>>> b0de865eb2f8eded5236a80ea59cd4982e3035c2
if current and current[0][0] is not None:
current = current[0][0]