From 824e068d0a6237ff82f1c6e091a971d6bd5af1b7 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 31 May 2018 18:09:21 +0530 Subject: [PATCH] typo fix --- erpnext/selling/doctype/quotation/quotation.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 8496a63cd7..6dc2c00e9c 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -3035,13 +3035,8 @@ "istable": 0, "max_attachments": 1, "menu_index": 0, -<<<<<<< HEAD - "modified": "2018-05-17 12:56:20.830562", - "modified_by": "Administrator", -======= "modified": "2018-05-28 03:23:15.354674", "modified_by": "Administrator", ->>>>>>> master "module": "Selling", "name": "Quotation", "owner": "Administrator",