解决冲突

designer_base/src/com/fr/design/gui/frpane/RegPane.java

@@ -28,22 +28,22 @@ import java.util.EventObject;
 
 public class RegPane extends BasicPane {
 	public static final RegExp[] ALL_REG_TYPE = {
-			new NoneReg(),
+		new NoneReg(),
-			//new RequiredReg(),
+		//new RequiredReg(),
-			new LengthReg(),
+		new LengthReg(),
-			//new FloatReg(),
+		//new FloatReg(),
-			new MailReg(),
+		new MailReg(),
-			new IDCardReg(),
+		new IDCardReg(),
-			new PostCardReg(),
+		new PostCardReg(),
-			new PhoneReg(),
+		new PhoneReg(),
-			new MobileReg(),
+		new MobileReg(),
-			new CustomReg()
+		new CustomReg()
 	};
 
 	public static final RegExp[] TEXTAREA_REG_TYPE = {
-			new NoneReg(),
+		new NoneReg(),
-			new LengthReg(),
+		new LengthReg(),
-			new CustomReg()
+		new CustomReg()
 	};
 
 	public static final RegExp[] PASSWORD_REG_TYPE = TEXTAREA_REG_TYPE;