commit 333d438c32ffb03c1e185810449e703daa8cbbc3
author Rushabh Mehta <rmehta@gmail.com> Wed Apr 24 10:08:39 2013 +0530
committer Rushabh Mehta <rmehta@gmail.com> Wed Apr 24 10:08:39 2013 +0530
tree 204b038f4b47596b1cd1843b9f3c6bc74b970189
parent f1cfbeaa5c011ee9e91226db26ad0cd7c6a14ee8

[merge]

stock/doctype/item/item.txt

diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index bd58f71..a311c4c 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

website/doctype/website_settings/website_settings.txt

diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt
index 7eaa50e..ed3380f 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",