Skip to content

Commit

Permalink
style: sort imports
Browse files Browse the repository at this point in the history
(cherry picked from commit 5b21ded)

# Conflicts:
#	landa/organization_management/report/member_contact_list/member_contact_list.py
  • Loading branch information
barredterra authored and mergify[bot] committed May 7, 2024
1 parent 0988153 commit d0e9306
Showing 1 changed file with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

import frappe
import pandas as pd
<<<<<<< HEAD

Check failure

Code scanning / CodeQL

Syntax error Error

Syntax Error (in Python 3).
=======
from frappe import _
>>>>>>> 5b21dedd (style: sort imports)

from ..member.member import Member, get_link_filters, remove_duplicate_indices

Expand Down

0 comments on commit d0e9306

Please sign in to comment.