commit 824e068d0a6237ff82f1c6e091a971d6bd5af1b7
author Saurabh <saurabh6790@gmail.com> Thu May 31 18:09:21 2018 +0530
committer Saurabh <saurabh6790@gmail.com> Thu May 31 18:11:05 2018 +0530
tree 0fd0f7d53358b7bf627441cad980471b9f71f1d5
parent 0eb622f7da94d0268e56b5f037109d2887241708

typo fix

erpnext/selling/doctype/quotation/quotation.json

diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 8496a63..6dc2c00 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",