mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-16 11:39:18 +00:00
fix: Use remove_all from file_manager
(cherry picked from commit 1e05c9467b)
# Conflicts:
# erpnext/regional/italy/utils.py
This commit is contained in:
@@ -3,7 +3,10 @@ import json
|
|||||||
|
|
||||||
import frappe
|
import frappe
|
||||||
from frappe import _
|
from frappe import _
|
||||||
|
<<<<<<< HEAD
|
||||||
from frappe.utils import cstr, flt
|
from frappe.utils import cstr, flt
|
||||||
|
=======
|
||||||
|
>>>>>>> 1e05c9467b (fix: Use remove_all from file_manager)
|
||||||
from frappe.utils.file_manager import remove_file
|
from frappe.utils.file_manager import remove_file
|
||||||
from six import string_types
|
from six import string_types
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user