commit 201af807065ab08d181ba3f5817d18f9337cddb3
author Nabin Hait <nabinhait@gmail.com> Tue Dec 13 14:30:32 2016 +0530
committer Nabin Hait <nabinhait@gmail.com> Tue Dec 13 14:30:32 2016 +0530
tree ca71caa6b9908b11d1a49707a81ad578575fbfb1
parent 403bab07a0e7a9982389d90ff4a8f42b939cbea8
parent 3bfe01d1e068d538b768e8a4949862b352a22ff5

Fixed merge conflict

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 213199f..aad8d42 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -356,4 +356,5 @@
 erpnext.patches.v7_0.update_status_of_po_so
 erpnext.patches.v7_1.set_budget_against_as_cost_center
 erpnext.patches.v7_1.set_currency_exchange_date
-erpnext.patches.v7_1.set_sales_person_status
\ No newline at end of file
+erpnext.patches.v7_1.set_sales_person_status
+erpnext.patches.v7_1.repost_stock_for_deleted_bins_for_merging_items