refs #5075

modules/client/front/balance/create/index.js

@@ -4,11 +4,6 @@ import Dialog from 'core/components/dialog';
 class Controller extends Dialog {
     constructor($element, $, $transclude, vnReport, vnEmail) {
         super($element, $, $transclude);
-<<<<<<< HEAD
-        this.viewReceipt = true;
-        this.sendEmail = true;
-=======
->>>>>>> dev
         this.vnReport = vnReport;
         this.vnEmail = vnEmail;
         this.receipt = {};