commit 99321cd538b06f1d809c4d8311e1a9ec1acaa485
author Rucha Mahabal <ruchamahabal2@gmail.com> Thu Feb 27 13:16:53 2020 +0530
committer Rucha Mahabal <ruchamahabal2@gmail.com> Thu Feb 27 13:16:53 2020 +0530
tree 758e92f7bb0016f152932262763004517dd58e83
parent e29d5c1d5ba079f4972d526b2381ec44809e6e12

fix: conflicts

erpnext/translations/sr_sp.csv

diff --git a/erpnext/translations/sr_sp.csv b/erpnext/translations/sr_sp.csv
index 5eb0c85..d1dfa94 100644
--- a/erpnext/translations/sr_sp.csv
+++ b/erpnext/translations/sr_sp.csv
@@ -810,7 +810,7 @@
 apps/erpnext/erpnext/config/help.py,Opening Stock Balance,Početno stanje zalihe
 ,Customer Credit Balance,Kreditni limit kupca
 apps/erpnext/erpnext/public/js/templates/address_list.html,No address added yet.,Adresa još nije dodata.
-DocType: Subscription,Net Total,Ukupno bez PDV-a
+DocType: C-Form Invoice Detail,Net Total,Ukupno bez PDV-a
 DocType: Sales Invoice,Total Qty,Ukupna kol.
 DocType: Purchase Invoice,Return,Povraćaj
 DocType: Sales Order Item,Delivery Warehouse,Skladište dostave