refactor:按规范修改代码、注释等

zhang6464 · Feb 19, 2019 · 62d7f31 · 62d7f31
1 parent 16c91d1
commit 62d7f31
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/lib/widgets/elements/Form/Button/DropdownButton/demo.dart b/lib/widgets/elements/Form/Button/DropdownButton/demo.dart
@@ -9,10 +9,6 @@ import 'package:flutter/material.dart';
 
 // DropdownButton 默认按钮的实例
 // isDisabled:是否是禁用，isDisabled 默认为true
-<<<<<<< HEAD
-=======
-
->>>>>>> 59253b7d99a8ef6fd83cd183d86e7416cf5a6235
 var selectItValue;
 var selectItemValue;
 

diff --git a/lib/widgets/elements/Form/Button/DropdownButton/index.dart b/lib/widgets/elements/Form/Button/DropdownButton/index.dart
@@ -56,11 +56,7 @@ class _DemoState extends State<Demo> {
   }
 }
 
-<<<<<<< HEAD
- // 所有的 DropdownButton 按钮
-=======
 // 所有的 DropdownButton 按钮
->>>>>>> 59253b7d99a8ef6fd83cd183d86e7416cf5a6235
 Widget allDropdownButtons(BuildContext context,_DemoState that){
   return Container(
     //padding:  EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0),