changed modified of global defaults.txt after merge conflict
changed modified of global defaults.txt after merge conflict

Tejal011089/huntercamp_erpnext,Tejal011089/paypal_erpnext,mbauskar/alec_frappe5_erpnext,rohitwaghchaure/GenieManager-erpnext,gangadhar-kadam/hrerp,indictranstech/phrerp,indictranstech/reciphergroup-erpnext,indictranstech/tele-erpnext,Tejal011089/digitales_erpnext,gangadhar-kadam/church-erpnext,indictranstech/trufil-erpnext,gangadharkadam/v4_erp,mbauskar/omnitech-demo-erpnext,sagar30051991/ozsmart-erp,indictranstech/erpnext,gangadharkadam/office_erp,indictranstech/fbd_erpnext,indictranstech/focal-erpnext,anandpdoshi/erpnext,saurabh6790/medsyn-app1,meisterkleister/erpnext,hatwar/buyback-erpnext,saurabh6790/OFF-RISAPP,gangadharkadam/v5_erp,anandpdoshi/erpnext,BhupeshGupta/erpnext,ThiagoGarciaAlves/erpnext,saurabh6790/aimobilize,saurabh6790/medsynaptic1-app,gangadharkadam/v4_erp,suyashphadtare/vestasi-erp-final,gangadharkadam/v6_erp,gangadharkadam/sterp,gangadharkadam/tailorerp,mbauskar/Das_Erpnext,ShashaQin/erpnext,gangadhar-kadam/prjapp,Tejal011089/huntercamp_erpnext,mbauskar/helpdesk-erpnext,saurabh6790/test-med-app,Drooids/erpnext,Tejal011089/huntercamp_erpnext,geekroot/erpnext,aruizramon/alec_erpnext,SPKian/Testing,mbauskar/alec_frappe5_erpnext,hatwar/Das_erpnext,saurabh6790/omn-app,gangadhar-kadam/laganerp,suyashphadtare/vestasi-erp-jan-end,suyashphadtare/vestasi-erp-final,hatwar/buyback-erpnext,Drooids/erpnext,saurabh6790/test_final_med_app,Drooids/erpnext,gangadhar-kadam/verve_test_erp,fuhongliang/erpnext,suyashphadtare/vestasi-erp-jan-end,gangadhar-kadam/sms-erpnext,gangadharkadam/saloon_erp_install,gangadhar-kadam/sapphire_app,mbauskar/omnitech-demo-erpnext,gangadharkadam/contributionerp,gangadharkadam/verveerp,gangadhar-kadam/verve_erp,geekroot/erpnext,tmimori/erpnext,dieface/erpnext,saurabh6790/medapp,gangadhar-kadam/verve_test_erp,saurabh6790/alert-med-app,SPKian/Testing,gangadharkadam/sher,mbauskar/sapphire-erpnext,indictranstech/reciphergroup-erpnext,aruizramon/alec_erpnext,gangadharkadam/saloon_erp_install,gangadhar-kadam/mtn-erpnext,saurabh6790/med_new_app,rohitwaghchaure/GenieManager-erpnext,suyashphadtare/gd-erp,sheafferusa/erpnext,Tejal011089/paypal_erpnext,indictranstech/biggift-erpnext,SPKian/Testing,meisterkleister/erpnext,saurabh6790/OFF-RISAPP,indictranstech/vestasi-erpnext,rohitwaghchaure/erpnext-receipher,njmube/erpnext,saurabh6790/test-med-app,gangadhar-kadam/nassimapp,indictranstech/phrerp,indictranstech/buyback-erp,mbauskar/helpdesk-erpnext,gangadharkadam/v5_erp,rohitwaghchaure/New_Theme_Erp,suyashphadtare/vestasi-erp-final,gangadhar-kadam/verve_test_erp,gangadhar-kadam/verve-erp,Tejal011089/Medsyn2_app,gmarke/erpnext,Tejal011089/trufil-erpnext,treejames/erpnext,indictranstech/osmosis-erpnext,Tejal011089/Medsyn2_app,BhupeshGupta/erpnext,sheafferusa/erpnext,ThiagoGarciaAlves/erpnext,4commerce-technologies-AG/erpnext,saurabh6790/test-erp,fuhongliang/erpnext,indictranstech/Das_Erpnext,saurabh6790/omnit-app,gangadhar-kadam/latestchurcherp,suyashphadtare/sajil-final-erp,gangadhar-kadam/sapphire_app,gangadhar-kadam/verve-erp,indictranstech/vestasi-erpnext,meisterkleister/erpnext,rohitwaghchaure/digitales_erpnext,gangadhar-kadam/laganerp,suyashphadtare/gd-erp,MartinEnder/erpnext-de,sheafferusa/erpnext,suyashphadtare/vestasi-update-erp,Drooids/erpnext,susuchina/ERPNEXT,sagar30051991/ozsmart-erp,indictranstech/buyback-erp,fuhongliang/erpnext,Tejal011089/med2-app,pombredanne/erpnext,mbauskar/Das_Erpnext,indictranstech/biggift-erpnext,saurabh6790/medapp,gangadhar-kadam/mtn-erpnext,gangadhar-kadam/helpdesk-erpnext,saurabh6790/test-erp,mahabuber/erpnext,hatwar/focal-erpnext,gangadharkadam/smrterp,pawaranand/phrerp,indictranstech/erpnext,suyashphadtare/test,mbauskar/phrerp,mbauskar/omnitech-erpnext,hatwar/focal-erpnext,saurabh6790/medsynaptic-app,ThiagoGarciaAlves/erpnext,Tejal011089/osmosis_erpnext,indictranstech/internal-erpnext,hanselke/erpnext-1,gangadhar-kadam/mic-erpnext,Tejal011089/fbd_erpnext,Yellowen/Owrang,MartinEnder/erpnext-de,Tejal011089/med2-app,gangadharkadam/contributionerp,gangadhar-kadam/verve_erp,gangadhar-kadam/adb-erp,Suninus/erpnext,rohitwaghchaure/GenieManager-erpnext,saurabh6790/omnisys-app,saurabh6790/test-erp,ShashaQin/erpnext,indictranstech/internal-erpnext,gangadharkadam/smrterp,gangadhar-kadam/prjapp,suyashphadtare/sajil-erp,gangadharkadam/v5_erp,sagar30051991/ozsmart-erp,njmube/erpnext,saurabh6790/test-erp,suyashphadtare/sajil-erp,saurabh6790/medsynaptic-app,mahabuber/erpnext,gangadharkadam/contributionerp,mbauskar/helpdesk-erpnext,gangadhar-kadam/verve_live_erp,indictranstech/Das_Erpnext,saurabh6790/tru_app_back,mbauskar/helpdesk-erpnext,mbauskar/omnitech-demo-erpnext,mbauskar/omnitech-erpnext,suyashphadtare/vestasi-update-erp,gangadharkadam/sher,mbauskar/alec_frappe5_erpnext,shft117/SteckerApp,gangadharkadam/vlinkerp,gangadharkadam/letzerp,shft117/SteckerApp,sagar30051991/ozsmart-erp,gmarke/erpnext,susuchina/ERPNEXT,SPKian/Testing2,BhupeshGupta/erpnext,Tejal011089/digitales_erpnext,tmimori/erpnext,rohitwaghchaure/erpnext-receipher,gangadharkadam/saloon_erp,gangadharkadam/vlinkerp,gangadhar-kadam/sapphire_app,gangadharkadam/vlinkerp,suyashphadtare/vestasi-erp-1,ShashaQin/erpnext,indictranstech/phrerp,saurabh6790/aimobilize-app-backup,anandpdoshi/erpnext,saurabh6790/alert-med-app,gangadhar-kadam/helpdesk-erpnext,mbauskar/alec_frappe5_erpnext,rohitwaghchaure/New_Theme_Erp,meisterkleister/erpnext,gsnbng/erpnext,SPKian/Testing2,saurabh6790/pow-app,saurabh6790/trufil_app,SPKian/Testing2,hatwar/Das_erpnext,indictranstech/fbd_erpnext,dieface/erpnext,rohitwaghchaure/erpnext_smart,hatwar/Das_erpnext,Tejal011089/fbd_erpnext,indictranstech/erpnext,Tejal011089/fbd_erpnext,gangadhar-kadam/powapp,gangadhar-kadam/mic-erpnext,suyashphadtare/vestasi-erp-1,rohitwaghchaure/New_Theme_Erp,saurabh6790/medsynaptic1-app,gangadhar-kadam/verve_live_erp,dieface/erpnext,Suninus/erpnext,gangadhar-kadam/hrerp,Tejal011089/fbd_erpnext,indictranstech/vestasi-erpnext,gangadhar-kadam/latestchurcherp,Suninus/erpnext,njmube/erpnext,gangadhar-kadam/latestchurcherp,gangadhar-kadam/verve_test_erp,netfirms/erpnext,rohitwaghchaure/erpnext-receipher,Yellowen/Owrang,Suninus/erpnext,gangadhar-kadam/helpdesk-erpnext,netfirms/erpnext,Aptitudetech/ERPNext,aruizramon/alec_erpnext,gangadhar-kadam/laganerp,gangadharkadam/v4_erp,hernad/erpnext,4commerce-technologies-AG/erpnext,gsnbng/erpnext,MartinEnder/erpnext-de,indictranstech/phrerp,indictranstech/focal-erpnext,susuchina/ERPNEXT,gangadharkadam/letzerp,hatwar/focal-erpnext,mbauskar/Das_Erpnext,indictranstech/trufil-erpnext,Tejal011089/digitales_erpnext,indictranstech/focal-erpnext,suyashphadtare/sajil-final-erp,mbauskar/internal-hr,indictranstech/osmosis-erpnext,gmarke/erpnext,treejames/erpnext,sheafferusa/erpnext,mbauskar/sapphire-erpnext,Tejal011089/osmosis_erpnext,Tejal011089/osmosis_erpnext,treejames/erpnext,dieface/erpnext,saurabh6790/ON-RISAPP,saurabh6790/medsyn-app1,suyashphadtare/vestasi-update-erp,saurabh6790/med_app_rels,netfirms/erpnext,pombredanne/erpnext,shft117/SteckerApp,rohitwaghchaure/erpnext_smart,gangadharkadam/v6_erp,gmarke/erpnext,treejames/erpnext,gangadhar-kadam/verve_erp,rohitwaghchaure/digitales_erpnext,Tejal011089/huntercamp_erpnext,gsnbng/erpnext,indictranstech/internal-erpnext,mbauskar/phrerp,indictranstech/vestasi-erpnext,gangadharkadam/verveerp,indictranstech/osmosis-erpnext,hanselke/erpnext-1,ShashaQin/erpnext,indictranstech/fbd_erpnext,gangadhar-kadam/verve-erp,suyashphadtare/sajil-erp,hernad/erpnext,indictranstech/buyback-erp,Tejal011089/trufil-erpnext,mbauskar/omnitech-demo-erpnext,mbauskar/sapphire-erpnext,indictranstech/fbd_erpnext,saurabh6790/med_app_rels,saurabh6790/omni-apps,indictranstech/tele-erpnext,saurabh6790/tru_app_back,shitolepriya/test-erp,gangadharkadam/verveerp,gangadhar-kadam/powapp,hatwar/focal-erpnext,rohitwaghchaure/digitales_erpnext,indictranstech/buyback-erp,gangadharkadam/vlinkerp,gangadharkadam/saloon_erp_install,indictranstech/internal-erpnext,shitolepriya/test-erp,gangadhar-kadam/latestchurcherp,anandpdoshi/erpnext,indictranstech/Das_Erpnext,saurabh6790/test_final_med_app,gangadharkadam/letzerp,saurabh6790/aimobilize-app-backup,ThiagoGarciaAlves/erpnext,indictranstech/reciphergroup-erpnext,indictranstech/reciphergroup-erpnext,rohitwaghchaure/GenieManager-erpnext,SPKian/Testing,4commerce-technologies-AG/erpnext,indictranstech/biggift-erpnext,gangadhar-kadam/smrterp,hernad/erpnext,saurabh6790/ON-RISAPP,gangadharkadam/letzerp,gangadharkadam/tailorerp,suyashphadtare/vestasi-erp-1,indictranstech/erpnext,mbauskar/Das_Erpnext,gangadhar-kadam/verve_erp,mbauskar/internal-hr,gangadharkadam/sterp,suyashphadtare/gd-erp,fuhongliang/erpnext,saurabh6790/omnit-app,mahabuber/erpnext,indictranstech/trufil-erpnext,gangadharkadam/office_erp,saurabh6790/omni-apps,shitolepriya/test-erp,njmube/erpnext,indictranstech/biggift-erpnext,Tejal011089/paypal_erpnext,mbauskar/omnitech-erpnext,gangadhar-kadam/sms-erpnext,mbauskar/omnitech-erpnext,gangadhar-kadam/verve_live_erp,gangadhar-kadam/adb-erp,saurabh6790/omnisys-app,hernad/erpnext,pombredanne/erpnext,Tejal011089/trufil-erpnext,gangadharkadam/office_erp,BhupeshGupta/erpnext,shitolepriya/test-erp,suyashphadtare/gd-erp,mbauskar/phrerp,gangadharkadam/v6_erp,gangadharkadam/johnerp,gangadharkadam/contributionerp,gangadhar-kadam/powapp,gangadharkadam/v6_erp,gangadharkadam/verveerp,Tejal011089/paypal_erpnext,pawaranand/phrerp,gangadhar-kadam/smrterp,Tejal011089/trufil-erpnext,saurabh6790/omnitech-apps,gangadhar-kadam/nassimapp,rohitwaghchaure/New_Theme_Erp,gangadhar-kadam/verve_live_erp,saurabh6790/med_new_app,susuchina/ERPNEXT,indictranstech/tele-erpnext,mbauskar/internal-hr,saurabh6790/omn-app,mbauskar/phrerp,hanselke/erpnext-1,gangadharkadam/saloon_erp,gsnbng/erpnext,saurabh6790/trufil_app,saurabh6790/medsyn-app,geekroot/erpnext,shft117/SteckerApp,hatwar/buyback-erpnext,suyashphadtare/test,indictranstech/osmosis-erpnext,indictranstech/focal-erpnext,Tejal011089/digitales_erpnext,netfirms/erpnext,rohitwaghchaure/digitales_erpnext,indictranstech/Das_Erpnext,hatwar/Das_erpnext,saurabh6790/pow-app,hatwar/buyback-erpnext,saurabh6790/medsyn-app,tmimori/erpnext,pombredanne/erpnext,saurabh6790/aimobilize,gangadharkadam/v4_erp,MartinEnder/erpnext-de,gangadharkadam/v5_erp,gangadharkadam/johnerp,gangadharkadam/saloon_erp,suyashphadtare/vestasi-erp-jan-end,mbauskar/sapphire-erpnext,gangadhar-kadam/church-erpnext,saurabh6790/omnitech-apps,suyashphadtare/sajil-final-erp,gangadhar-kadam/helpdesk-erpnext,Tejal011089/osmosis_erpnext,aruizramon/alec_erpnext,pawaranand/phrerp,mahabuber/erpnext,gangadharkadam/saloon_erp,geekroot/erpnext,indictranstech/tele-erpnext,SPKian/Testing2,suyashphadtare/test,rohitwaghchaure/erpnext_smart,suyashphadtare/vestasi-erp-jan-end,gangadharkadam/saloon_erp_install,indictranstech/trufil-erpnext,hanselke/erpnext-1,rohitwaghchaure/erpnext-receipher,tmimori/erpnext,pawaranand/phrerp