修了pull带来的报错

焯
Blessing-Studio · Jan 20, 2023 · 05c763f · 05c763f
1 parent bd67c08
commit 05c763f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 33 deletions.
diff --git a/WonderLab/Program.cs b/WonderLab/Program.cs
@@ -18,7 +18,6 @@ internal class Program
         [STAThread]
         public static void Main(string[] args)
         {
-<<<<<<< Updated upstream
             //if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             //{
             //    if (File.Exists(Path.Combine("updata-cache", "UpdataNextTime")))
@@ -29,7 +28,6 @@ public static void Main(string[] args)
             //        return;
             //    }
             //}
-=======
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 //if (File.Exists(Path.Combine("updata-cache", "UpdataNextTime")))
@@ -40,7 +38,6 @@ public static void Main(string[] args)
                 //    return;
                 //}
             }
->>>>>>> Stashed changes
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             BuildAvaloniaApp()
             .StartWithClassicDesktopLifetime(args);

diff --git a/WonderLab/ViewModels/OtherViewModel.cs b/WonderLab/ViewModels/OtherViewModel.cs
@@ -21,7 +21,6 @@ public partial class OtherViewModel : ViewModelBase
     {
         public async Task Check()
         {
-<<<<<<< Updated upstream
             try
             {
                 await Task.Run(() =>
@@ -41,7 +40,6 @@ await Task.Run(() =>
             {
 
             }
-=======
             await Task.Run(async () =>
             {
                 IsCheckVersion = true;
@@ -57,7 +55,6 @@ await Task.Run(async () =>
                 //    }
                 //}
             });
->>>>>>> Stashed changes
         }
     }
 

diff --git a/WonderLab/Views/OtherView.axaml b/WonderLab/Views/OtherView.axaml
@@ -38,32 +38,6 @@
 			</card:OptionsDisplayItem>
 
 			<card:OptionsDisplayItem Expands="True" Margin="10,15,10,0" Header="Blessing Studio" Description="本启动器的开发团队">
-<<<<<<< Updated upstream
-					<!--<card:OptionsDisplayItem.Icon>
-					<ui:SymbolIcon Symbol="People"/>
-				</card:OptionsDisplayItem.Icon>-->
-					<card:OptionsDisplayItem.Content>
-						<StackPanel Orientation="Vertical" Spacing="10">
-							<StackPanel Orientation="Horizontal" Spacing="50">
-								<TextBlock Text="前端开发"/>
-								<TextBlock Text="西路Baka"/>
-							</StackPanel>
-							<StackPanel Orientation="Horizontal" Spacing="50">
-								<TextBlock Text="后端开发"/>
-								<TextBlock Text="Ddggdd135、[mailset@arch ~ ]$"/>
-							</StackPanel>
-							<StackPanel Orientation="Horizontal" Spacing="35">
-								<TextBlock Text="跨平台编译"/>
-								<TextBlock Text="[mailset@arch ~ ]$"/>
-							</StackPanel>
-							<StackPanel Orientation="Horizontal" Spacing="60">
-								<TextBlock Text="UI 审查"/>
-								<TextBlock Text="Starcloudsea"/>
-							</StackPanel>
-						</StackPanel>
-					</card:OptionsDisplayItem.Content>
-				</card:OptionsDisplayItem>
-=======
 				<!--<card:OptionsDisplayItem.Icon>
 					<ui:SymbolIcon Symbol="People"/>
 				</card:OptionsDisplayItem.Icon>-->
@@ -88,7 +62,6 @@
 					</StackPanel>
 				</card:OptionsDisplayItem.Content>
 			</card:OptionsDisplayItem>
->>>>>>> Stashed changes
 
 				<card:OptionsDisplayItem Expands="True" Margin="10,15,10,0" Header="特别鸣谢" Description="感谢所有为本启动器开发提供帮助的大佬">
 				<!--<card:OptionsDisplayItem.Icon>