[fix] [minor] merge conflict fixes

2026-05-31 18:59:08 +00:00 · 2013-12-10 18:01:18 +05:30
parent 7b1d9409f1 4e677a3f52
commit aebb9f422b
14 changed files with 187 additions and 111 deletions
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-05-24 19:29:09", 
  "docstatus": 0, 
-  "modified": "2013-12-06 15:15:49", 
+  "modified": "2013-12-09 16:24:08", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
--- a/stock/doctype/stock_entry/stock_entry.txt
+++ b/stock/doctype/stock_entry/stock_entry.txt
@@ -2,7 +2,7 @@
 {
  "creation": "2013-04-09 11:43:55", 
  "docstatus": 0, 
-  "modified": "2013-12-06 15:15:25", 
+  "modified": "2013-12-09 16:24:10", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 },