commit f68d563a68a08e9996537a153ddf26fe31ed2d68
author Nabin Hait <nabinhait@gmail.com> Wed Aug 21 17:49:26 2013 +0530
committer Nabin Hait <nabinhait@gmail.com> Wed Aug 21 17:49:26 2013 +0530
tree cd1ace80feeb73d87eb5d8575deb8423dcb433bd
parent 9b09c95d837284b0c55576faee6024ca4e2f3bdb
parent 72c9aa083aeb923ab130e230fa06e9f352276545

[minor] fixed conflict while merging with master

patches/patch_list.py

diff --git a/patches/patch_list.py b/patches/patch_list.py
index 430cc61..72885f6 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -259,4 +259,5 @@
 	"execute:webnotes.reload_doc('accounts', 'Print Format', 'POS Invoice') # 2013-08-16",
 	"execute:webnotes.delete_doc('DocType', 'Stock Ledger')",
 	"patches.august_2013.p06_deprecate_cancelled_sl_entry",
+	"patches.august_2013.p06_fix_sle_against_stock_entry",
 ]
\ No newline at end of file