From 59e9f5192c56d4bff7c10290e01fb30f8c3f301e Mon Sep 17 00:00:00 2001
From: Nishka Gosalia <nishkagosalia@Nishkas-MacBook-Air.local>
Date: Sat, 23 May 2026 15:35:19 +0530
Subject: [PATCH] fix: merge conflicts

---
 erpnext/projects/doctype/project/project.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index c0db91c560b..24841972ea4 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -464,11 +464,7 @@
  "index_web_pages_for_search": 1,
  "links": [],
  "max_attachments": 4,
-<<<<<<< HEAD
- "modified": "2025-08-21 17:57:58.314809",
-=======
  "modified": "2026-05-22 16:45:50.762759",
->>>>>>> 9d8f3863f2 (fix(project): update customer and sales order as no copy)
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Project",