confict

2560a5eb · 叶海龙 · 574ad9c0 · 2560a5eb · 2560a5eb
Commit 2560a5eb authored Feb 19, 2019 by 叶海龙
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

Program.cs myProject/Program.cs +9 -0

TextFile.txt myProject/TextFile.txt +0 -1

No files found.
--- a/myProject/Program.cs
+++ b/myProject/Program.cs
@@ -20,5 +20,14 @@ namespace myProject
 		public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
 			WebHost.CreateDefaultBuilder(args)
 				.UseStartup<Startup>();
+
+		public void GetStatus()
+		{
+			if ("a".Equals("a"))
+			{
+				return;
+			}
+		}
+
 	}
 }
--- a/myProject/TextFile.txt
+++ b/myProject/TextFile.txt
@@ -3,4 +3,3 @@
 484849848
 98456
 myname is yehailong
-