From 333d438c32ffb03c1e185810449e703daa8cbbc3 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 24 Apr 2013 10:08:39 +0530
Subject: [PATCH] [merge]

---
 stock/doctype/item/item.txt                   | 75 -------------------
 .../website_settings/website_settings.txt     |  1 +
 2 files changed, 1 insertion(+), 75 deletions(-)

diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index bd58f71c77..a311c4c5bc 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -878,92 +878,17 @@
   "read_only": 0
  }, 
  {
-<<<<<<< HEAD
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "report": 0, 
-  "role": "Material Manager", 
-  "write": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "report": 1, 
-  "role": "Material Manager", 
-  "write": 0
-=======
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
   "role": "Material Master Manager", 
   "write": 1
->>>>>>> 59a6cd6c44481b56566131557bdcccaa865527cd
  }, 
  {
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-<<<<<<< HEAD
-  "permlevel": 1, 
-  "report": 0, 
   "role": "Material User", 
   "write": 0
- }, 
- {
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "report": 1, 
-  "role": "Material User", 
-  "write": 0
- }, 
- {
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "report": 1, 
-  "role": "Material Master Manager", 
-  "write": 1
-=======
-  "role": "Material Manager", 
-  "write": 0
->>>>>>> 59a6cd6c44481b56566131557bdcccaa865527cd
- }, 
- {
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-<<<<<<< HEAD
-  "permlevel": 1, 
-  "report": 0, 
-  "role": "Material Master Manager", 
-  "write": 0
- }, 
- {
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "report": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "report": 0, 
-  "role": "System Manager", 
-=======
-  "role": "Material User", 
->>>>>>> 59a6cd6c44481b56566131557bdcccaa865527cd
-  "write": 0
  }
 ]
\ No newline at end of file
diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt
index 7eaa50edb5..ed3380f16d 100644
--- a/website/doctype/website_settings/website_settings.txt
+++ b/website/doctype/website_settings/website_settings.txt
@@ -1,4 +1,5 @@
 [
+ {
   "creation": "2013-03-26 06:51:18", 
   "docstatus": 0, 
   "modified": "2013-04-17 11:51:24",