xt / Flutter-ReserveApp · Commits

Go to a project

Commit 60346bab2e49b156e129699910601c41ca51629b

Authored by wdn127929
1 parent 44366af3
build: skipped

合并线上版本5.4.2

Inline Side-by-side
Showing 1 changed file with 12 additions and 0 deletions
@@ -570,7 +570,11 @@ @@ -570,7 +570,11 @@
570 "$(inherited)", 570 "$(inherited)",
571 "$(PROJECT_DIR)/Flutter", 571 "$(PROJECT_DIR)/Flutter",
572 ); 572 );
  573 +<<<<<<< HEAD
573 MARKETING_VERSION = 6.0.0; 574 MARKETING_VERSION = 6.0.0;
  575 +=======
  576 + MARKETING_VERSION = 5.4.3;
  577 +>>>>>>> 58718afe (预订安排页人数变更修改)
574 PODS_ROOT = "$(inherited)"; 578 PODS_ROOT = "$(inherited)";
575 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 579 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
576 PRODUCT_NAME = Runner; 580 PRODUCT_NAME = Runner;
@@ -722,7 +726,11 @@ @@ -722,7 +726,11 @@
722 "$(inherited)", 726 "$(inherited)",
723 "$(PROJECT_DIR)/Flutter", 727 "$(PROJECT_DIR)/Flutter",
724 ); 728 );
  729 +<<<<<<< HEAD
725 MARKETING_VERSION = 6.0.0; 730 MARKETING_VERSION = 6.0.0;
  731 +=======
  732 + MARKETING_VERSION = 5.4.3;
  733 +>>>>>>> 58718afe (预订安排页人数变更修改)
726 PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json"; 734 PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json";
727 PODS_ROOT = "$(inherited)"; 735 PODS_ROOT = "$(inherited)";
728 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 736 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
@@ -763,7 +771,11 @@ @@ -763,7 +771,11 @@
763 "$(inherited)", 771 "$(inherited)",
764 "$(PROJECT_DIR)/Flutter", 772 "$(PROJECT_DIR)/Flutter",
765 ); 773 );
  774 +<<<<<<< HEAD
766 MARKETING_VERSION = 6.0.0; 775 MARKETING_VERSION = 6.0.0;
  776 +=======
  777 + MARKETING_VERSION = 5.4.3;
  778 +>>>>>>> 58718afe (预订安排页人数变更修改)
767 PODS_ROOT = "$(inherited)"; 779 PODS_ROOT = "$(inherited)";
768 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 780 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
769 PRODUCT_NAME = Runner; 781 PRODUCT_NAME = Runner;