resolve conflit

2020-10-14 21:46:35 +06:30
parent 4862f1123d 3a6fee3f43
commit 68ff930145
75 changed files with 2002 additions and 450 deletions
--- a/lib/pages/box/box_info.dart
+++ b/lib/pages/box/box_info.dart
@@ -545,7 +545,7 @@ class _BoxInfoState extends State<BoxInfo> {
  _gotoEditor() async {
    Navigator.push(
      context,
-      BottomUpPageRoute(BoxEditor(box: widget.box)),
+      CupertinoPageRoute(builder: (context) => BoxEditor(box: widget.box)),
    );
  }
 }