merge
This commit is contained in:
Binary file not shown.
@@ -10,7 +10,7 @@
|
||||
</data>
|
||||
<key>flutter_assets/AssetManifest.json</key>
|
||||
<data>
|
||||
Lof5rxtoYEskEGs2ozVMl9R8UpM=
|
||||
VTPOnQqN+tECIpq89p1/PCxgDVU=
|
||||
</data>
|
||||
<key>flutter_assets/FontManifest.json</key>
|
||||
<data>
|
||||
@@ -20,6 +20,18 @@
|
||||
<data>
|
||||
03NrJWNrIk7mY9xo87y2tGqWP7E=
|
||||
</data>
|
||||
<key>flutter_assets/assets/images/banner.png</key>
|
||||
<data>
|
||||
1ElnkW4IvmNaCVQvXbfUiAVEboE=
|
||||
</data>
|
||||
<key>flutter_assets/assets/images/location.png</key>
|
||||
<data>
|
||||
WeT8G1QDNyrGRQikaR2IGrRvsD8=
|
||||
</data>
|
||||
<key>flutter_assets/assets/images/search.png</key>
|
||||
<data>
|
||||
bbW0EKFzhnRZv1DDPt08Hk6bU+U=
|
||||
</data>
|
||||
<key>flutter_assets/assets/login/auth_bg.png</key>
|
||||
<data>
|
||||
RpCxP+mrFgGPMhMwv07GFA2yuA8=
|
||||
@@ -58,7 +70,11 @@
|
||||
</data>
|
||||
<key>flutter_assets/kernel_blob.bin</key>
|
||||
<data>
|
||||
<<<<<<< HEAD
|
||||
ZTV1TdGH/FlC+1YSqgslbyfISlA=
|
||||
=======
|
||||
LlBeRKUEYDYsCKCwJbjmshEh+U8=
|
||||
>>>>>>> c343dbbe837dcf89d4a27e42bf0ff3ea3c5cd660
|
||||
</data>
|
||||
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
<data>
|
||||
@@ -75,11 +91,11 @@
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
Lof5rxtoYEskEGs2ozVMl9R8UpM=
|
||||
VTPOnQqN+tECIpq89p1/PCxgDVU=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
WLU49xF+f2TX0hn+Z8PQSeE4ukii5jygnaQ7rgbac/A=
|
||||
V5CBcyqvq3Y/V2+oEwlcwJE9mu+obUxEpv/0L3SSXMw=
|
||||
</data>
|
||||
</dict>
|
||||
<key>flutter_assets/FontManifest.json</key>
|
||||
@@ -104,6 +120,39 @@
|
||||
Siue8m0KLeurw/rOyV4B65pm6vw5kIdIRqSGsvIh+FM=
|
||||
</data>
|
||||
</dict>
|
||||
<key>flutter_assets/assets/images/banner.png</key>
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
1ElnkW4IvmNaCVQvXbfUiAVEboE=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
TF2i3fnWayMf34R3vKzUV9WG/5XNvz08XuIgRbW3XLw=
|
||||
</data>
|
||||
</dict>
|
||||
<key>flutter_assets/assets/images/location.png</key>
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
WeT8G1QDNyrGRQikaR2IGrRvsD8=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
F/uUnCCGE7yndHTmhkCKDSKaRROI62vsfaEM035x9sc=
|
||||
</data>
|
||||
</dict>
|
||||
<key>flutter_assets/assets/images/search.png</key>
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
bbW0EKFzhnRZv1DDPt08Hk6bU+U=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
8uEXkDwL1D1h55unuX3Zog5KVRkjr8gw4lVX6GF9kUI=
|
||||
</data>
|
||||
</dict>
|
||||
<key>flutter_assets/assets/login/auth_bg.png</key>
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
@@ -207,11 +256,19 @@
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
<<<<<<< HEAD
|
||||
ZTV1TdGH/FlC+1YSqgslbyfISlA=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
1wu0Khf1NOSuLg4ikVfUT7FaFCyaropzppwLzY182WM=
|
||||
=======
|
||||
LlBeRKUEYDYsCKCwJbjmshEh+U8=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
mZuhK+nwTm2nG5LDtFIfjW+VSPVmVFNfG8/YuBuvF4I=
|
||||
>>>>>>> c343dbbe837dcf89d4a27e42bf0ff3ea3c5cd660
|
||||
</data>
|
||||
</dict>
|
||||
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"assets/login/auth_bg.png":["assets/login/auth_bg.png"],"assets/tabBar/tabBar_00.png":["assets/tabBar/tabBar_00.png"],"assets/tabBar/tabBar_01.png":["assets/tabBar/tabBar_01.png"],"assets/tabBar/tabBar_02.png":["assets/tabBar/tabBar_02.png"],"assets/tabBar/tabBar_show_00.png":["assets/tabBar/tabBar_show_00.png"],"assets/tabBar/tabBar_show_01.png":["assets/tabBar/tabBar_show_01.png"],"assets/tabBar/tabBar_show_02.png":["assets/tabBar/tabBar_show_02.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
|
||||
{"assets/images/banner.png":["assets/images/banner.png"],"assets/images/location.png":["assets/images/location.png"],"assets/images/search.png":["assets/images/search.png"],"assets/login/auth_bg.png":["assets/login/auth_bg.png"],"assets/tabBar/tabBar_00.png":["assets/tabBar/tabBar_00.png"],"assets/tabBar/tabBar_01.png":["assets/tabBar/tabBar_01.png"],"assets/tabBar/tabBar_02.png":["assets/tabBar/tabBar_02.png"],"assets/tabBar/tabBar_show_00.png":["assets/tabBar/tabBar_show_00.png"],"assets/tabBar/tabBar_show_01.png":["assets/tabBar/tabBar_show_01.png"],"assets/tabBar/tabBar_show_02.png":["assets/tabBar/tabBar_show_02.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
|
||||
Binary file not shown.
@@ -82,7 +82,7 @@
|
||||
</data>
|
||||
<key>Assets.car</key>
|
||||
<data>
|
||||
wazevhUzQNWk/atBqXdkO4Cd+AU=
|
||||
a8kp9RAG/YJIuyATNTtFLHMhlUQ=
|
||||
</data>
|
||||
<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
|
||||
<data>
|
||||
@@ -110,7 +110,11 @@
|
||||
</data>
|
||||
<key>Frameworks/App.framework/App</key>
|
||||
<data>
|
||||
<<<<<<< HEAD
|
||||
26OeWvFy4J6UUsUeqZJH1ghL/a8=
|
||||
=======
|
||||
TBZIZGNw8HC9UntMfJHUSXhkE4o=
|
||||
>>>>>>> c343dbbe837dcf89d4a27e42bf0ff3ea3c5cd660
|
||||
</data>
|
||||
<key>Frameworks/App.framework/Info.plist</key>
|
||||
<data>
|
||||
@@ -118,11 +122,15 @@
|
||||
</data>
|
||||
<key>Frameworks/App.framework/_CodeSignature/CodeResources</key>
|
||||
<data>
|
||||
<<<<<<< HEAD
|
||||
CJSPj8M3++Lhb2JBUJ1bGRW5gXs=
|
||||
=======
|
||||
KuDcyu8I/uI3XM0FsIB6QlE+Kjg=
|
||||
>>>>>>> c343dbbe837dcf89d4a27e42bf0ff3ea3c5cd660
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/AssetManifest.json</key>
|
||||
<data>
|
||||
Lof5rxtoYEskEGs2ozVMl9R8UpM=
|
||||
VTPOnQqN+tECIpq89p1/PCxgDVU=
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/FontManifest.json</key>
|
||||
<data>
|
||||
@@ -132,6 +140,18 @@
|
||||
<data>
|
||||
03NrJWNrIk7mY9xo87y2tGqWP7E=
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/assets/images/banner.png</key>
|
||||
<data>
|
||||
1ElnkW4IvmNaCVQvXbfUiAVEboE=
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/assets/images/location.png</key>
|
||||
<data>
|
||||
WeT8G1QDNyrGRQikaR2IGrRvsD8=
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/assets/images/search.png</key>
|
||||
<data>
|
||||
bbW0EKFzhnRZv1DDPt08Hk6bU+U=
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/assets/login/auth_bg.png</key>
|
||||
<data>
|
||||
RpCxP+mrFgGPMhMwv07GFA2yuA8=
|
||||
@@ -170,7 +190,11 @@
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/kernel_blob.bin</key>
|
||||
<data>
|
||||
<<<<<<< HEAD
|
||||
ZTV1TdGH/FlC+1YSqgslbyfISlA=
|
||||
=======
|
||||
LlBeRKUEYDYsCKCwJbjmshEh+U8=
|
||||
>>>>>>> c343dbbe837dcf89d4a27e42bf0ff3ea3c5cd660
|
||||
</data>
|
||||
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
<data>
|
||||
@@ -182,7 +206,11 @@
|
||||
</data>
|
||||
<key>Frameworks/Flutter.framework/Flutter</key>
|
||||
<data>
|
||||
<<<<<<< HEAD
|
||||
iI0cuuvR3fNWhVcJBzQVMZGmeKA=
|
||||
=======
|
||||
8qhMWyZmus22YFLjtzB4mTHo67Y=
|
||||
>>>>>>> c343dbbe837dcf89d4a27e42bf0ff3ea3c5cd660
|
||||
</data>
|
||||
<key>Frameworks/Flutter.framework/Headers/Flutter.h</key>
|
||||
<data>
|
||||
@@ -266,7 +294,7 @@
|
||||
</data>
|
||||
<key>Info.plist</key>
|
||||
<data>
|
||||
XyDeXKaoyo5GWFzDnNBw+Gx7o8A=
|
||||
/RQCq13KJBMov0SzKJuLkfbxdGw=
|
||||
</data>
|
||||
<key>PkgInfo</key>
|
||||
<data>
|
||||
@@ -488,11 +516,11 @@
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
wazevhUzQNWk/atBqXdkO4Cd+AU=
|
||||
a8kp9RAG/YJIuyATNTtFLHMhlUQ=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
JBjaIj0rqYL3OjG9T6+5PEwnK6i0XuAL6MfH1lCDjHE=
|
||||
iEAI+rG4BoNcaTdDWb7qCDDh9Odoelu7IAjEYskeSiM=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key>
|
||||
@@ -565,11 +593,19 @@
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
<<<<<<< HEAD
|
||||
26OeWvFy4J6UUsUeqZJH1ghL/a8=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
4zyr0QJjQR7TBJzjiY3llfWCKH5V820hC3KgTAuzXtU=
|
||||
=======
|
||||
TBZIZGNw8HC9UntMfJHUSXhkE4o=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
80d5Tk3nk5fYkL19scc7rxrEBfwo//LLLTG2DGtMTUU=
|
||||
>>>>>>> c343dbbe837dcf89d4a27e42bf0ff3ea3c5cd660
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/Info.plist</key>
|
||||
@@ -587,22 +623,30 @@
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
<<<<<<< HEAD
|
||||
CJSPj8M3++Lhb2JBUJ1bGRW5gXs=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
v86IUgD1HgiFCBZodGO3tx3TlGx7rwDreIbYJBewTi8=
|
||||
=======
|
||||
KuDcyu8I/uI3XM0FsIB6QlE+Kjg=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
md+RlnlHpKbBcpsYkw6IlB1RilcIPZK9sduvDFBq/B4=
|
||||
>>>>>>> c343dbbe837dcf89d4a27e42bf0ff3ea3c5cd660
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/flutter_assets/AssetManifest.json</key>
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
Lof5rxtoYEskEGs2ozVMl9R8UpM=
|
||||
VTPOnQqN+tECIpq89p1/PCxgDVU=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
WLU49xF+f2TX0hn+Z8PQSeE4ukii5jygnaQ7rgbac/A=
|
||||
V5CBcyqvq3Y/V2+oEwlcwJE9mu+obUxEpv/0L3SSXMw=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/flutter_assets/FontManifest.json</key>
|
||||
@@ -627,6 +671,39 @@
|
||||
Siue8m0KLeurw/rOyV4B65pm6vw5kIdIRqSGsvIh+FM=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/flutter_assets/assets/images/banner.png</key>
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
1ElnkW4IvmNaCVQvXbfUiAVEboE=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
TF2i3fnWayMf34R3vKzUV9WG/5XNvz08XuIgRbW3XLw=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/flutter_assets/assets/images/location.png</key>
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
WeT8G1QDNyrGRQikaR2IGrRvsD8=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
F/uUnCCGE7yndHTmhkCKDSKaRROI62vsfaEM035x9sc=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/flutter_assets/assets/images/search.png</key>
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
bbW0EKFzhnRZv1DDPt08Hk6bU+U=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
8uEXkDwL1D1h55unuX3Zog5KVRkjr8gw4lVX6GF9kUI=
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/flutter_assets/assets/login/auth_bg.png</key>
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
@@ -730,11 +807,19 @@
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
<<<<<<< HEAD
|
||||
ZTV1TdGH/FlC+1YSqgslbyfISlA=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
1wu0Khf1NOSuLg4ikVfUT7FaFCyaropzppwLzY182WM=
|
||||
=======
|
||||
LlBeRKUEYDYsCKCwJbjmshEh+U8=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
mZuhK+nwTm2nG5LDtFIfjW+VSPVmVFNfG8/YuBuvF4I=
|
||||
>>>>>>> c343dbbe837dcf89d4a27e42bf0ff3ea3c5cd660
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
|
||||
@@ -763,11 +848,19 @@
|
||||
<dict>
|
||||
<key>hash</key>
|
||||
<data>
|
||||
<<<<<<< HEAD
|
||||
iI0cuuvR3fNWhVcJBzQVMZGmeKA=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
ZKxMtJso5OL2VBLB7b1zn8r9eSzKkgsRy23rW9NMFhw=
|
||||
=======
|
||||
8qhMWyZmus22YFLjtzB4mTHo67Y=
|
||||
</data>
|
||||
<key>hash2</key>
|
||||
<data>
|
||||
Vo7IXQp57TGVaP1WrFA8LCJnEiWRbvXbyJVJK8K9+yA=
|
||||
>>>>>>> c343dbbe837dcf89d4a27e42bf0ff3ea3c5cd660
|
||||
</data>
|
||||
</dict>
|
||||
<key>Frameworks/Flutter.framework/Headers/Flutter.h</key>
|
||||
|
||||
Reference in New Issue
Block a user