merge2
This commit is contained in:
parent
8301a027f0
commit
2340c6910a
|
|
@ -1 +1 @@
|
|||
44fc356cf2d1d4ae209d5b43cb64058a2f4f8d822c8b43a5400af1cafeef5385
|
||||
d0c1256d489dc0d6afc5f30de2e467c12844f917cb91a10132c8c6ff1443f334
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
D:\REPOS\MANGO\source\FruitBankHybridApp\FruitBankHybrid.Shared\wwwroot\app.css
|
||||
D:\REPOS\MANGO\source\FruitBankHybridApp\FruitBankHybrid.Shared\wwwroot\bootstrap\bootstrap.min.css
|
||||
D:\REPOS\MANGO\source\FruitBankHybridApp\FruitBankHybrid.Shared\wwwroot\bootstrap\bootstrap.min.css.map
|
||||
|
|
@ -14,7 +14,7 @@ using System.Reflection;
|
|||
[assembly: System.Reflection.AssemblyCompanyAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0+b219f853db168256fe8bf9bb5b74702dc5e79eca")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0+562afc74d739bdf11151571a8257f447da2df68c")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
6cbbfcda3fa473626db57be1e99720e6a7cb83e7061f9c301b7ee04910878f5a
|
||||
0407e9863c77fa0e1fd06c1359645847bd99760876f7382e11631a5894c70bad
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
|
@ -1 +1,8 @@
|
|||
animation\enterfromleft;animation\enterfromleft
|
||||
animation\enterfromright;animation\enterfromright
|
||||
animation\exittoleft;animation\exittoleft
|
||||
animation\exittoright;animation\exittoright
|
||||
layout\flyoutcontent;compatibility\Android\Resources\layout\flyoutcontent
|
||||
layout\shellcontent;compatibility\Android\Resources\layout\shellcontent
|
||||
values\colors;values\colors
|
||||
values\strings;values\strings
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -36,3 +36,4 @@ H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid.Shared\obj\Debug
|
|||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid.Shared\obj\Debug\net9.0\staticwebassets.build.json
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid.Shared\obj\Debug\net9.0\staticwebassets.build.json
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid.Shared\obj\Debug\net9.0\staticwebassets.build.json
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid.Shared\obj\Debug\net9.0\staticwebassets.build.json
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
wwwroot\index.html
|
||||
wwwroot\app.css
|
||||
wwwroot\index.html
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\wwwroot\app.css
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\wwwroot\index.html
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ using System.Reflection;
|
|||
[assembly: System.Reflection.AssemblyCompanyAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0+b219f853db168256fe8bf9bb5b74702dc5e79eca")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0+562afc74d739bdf11151571a8257f447da2df68c")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
711f9f7c31c10972a62784ab2fa8159017818571b0e70312bccd00229d894b61
|
||||
fcdd19e1b12437f1180406252845c31054857acd39555e5bd359c0b531953c6d
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -14,7 +14,7 @@ using System.Reflection;
|
|||
[assembly: System.Reflection.AssemblyCompanyAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0+b219f853db168256fe8bf9bb5b74702dc5e79eca")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0+562afc74d739bdf11151571a8257f447da2df68c")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
49b8a8efa9ce06fe61ce8c23cd01f5eb6d244167e47de90637fbf78b943e0840
|
||||
8ce37fcd923e15015684bf4d166eefb056c91a84a8e6326683127e8d713b589e
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -18,7 +18,7 @@ using System.Reflection;
|
|||
[assembly: System.Reflection.AssemblyCompanyAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0+b219f853db168256fe8bf9bb5b74702dc5e79eca")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0+562afc74d739bdf11151571a8257f447da2df68c")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("FruitBankHybrid")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
e8c4c504b5767786b9bb5bd9bbfc1b9d7a4e32daa1b9c11e87efb78e501279e2
|
||||
9fe446151aeb73ce3741e00885669ad9ce404c9360edb07a9b72d422b9665d4e
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,8 +1,3 @@
|
|||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\dotnet_bot.scale-400.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\dotnet_bot.scale-200.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\dotnet_bot.scale-150.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\dotnet_bot.scale-125.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\dotnet_bot.scale-100.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\appiconLargeTile.scale-400.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\appiconLargeTile.scale-200.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\appiconLargeTile.scale-150.png
|
||||
|
|
@ -49,3 +44,8 @@ H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0
|
|||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\appiconLogo.scale-125.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\appiconLogo.scale-100.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\appicon.ico
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\dotnet_bot.scale-400.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\dotnet_bot.scale-200.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\dotnet_bot.scale-150.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\dotnet_bot.scale-125.png
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\obj\Debug\net9.0-windows10.0.19041.0\win10-x64\resizetizer\r\dotnet_bot.scale-100.png
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -26,3 +26,4 @@ H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid.Shared\obj\Debug
|
|||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid.Shared\obj\Debug\net9.0\staticwebassets.build.json
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid.Shared\obj\Debug\net9.0\staticwebassets.build.json
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid.Shared\obj\Debug\net9.0\staticwebassets.build.json
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid.Shared\obj\Debug\net9.0\staticwebassets.build.json
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
wwwroot\index.html
|
||||
wwwroot\app.css
|
||||
wwwroot\index.html
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\wwwroot\app.css
|
||||
H:\Applications\Mango\Source\FruitBankHybridApp\FruitBankHybrid\wwwroot\index.html
|
||||
|
|
|
|||
Loading…
Reference in New Issue