update merge

src/components/DialogForm/index.vue

@@ -143,12 +143,9 @@ function findMaxLabelWidth(rows) {
 			if (!opt.label) return 0;
 			if (opt.label.length > max) {
 				max = opt.label.length;
-<<<<<<< HEAD
 				if (opt.label.includes('(')) {
 					max = max - 3;
 				}
-=======
->>>>>>> projects/mesxc-test
 			}
 		});
 	});