nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2023-10-09 15:17:15 +05:30
parent 63274527d2
commit 8fc705ea6a
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/public/js/erpnext.bundle.js
View File

@@ -18,11 +18,7 @@ import "./utils/customer_quick_entry";
import "./utils/supplier_quick_entry";
import "./call_popup/call_popup";
import "./utils/dimension_tree_filter";
<<<<<<< HEAD
=======
import "./utils/ledger_preview.js";
import "./utils/unreconcile.js";
>>>>>>> 25fe752185 (chore: move functions to a separate file in utils)
import "./utils/barcode_scanner";
import "./telephony";
import "./templates/call_link.html";