fix conlict

552d19d1 · 叶海龙 · 462ebf48 · 2560a5eb · 552d19d1 · 552d19d1
Commit 552d19d1 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
@@ -21,10 +21,19 @@ namespace myProject
 			WebHost.CreateDefaultBuilder(args)
 				.UseStartup<Startup>();

+
 		public void GetMessage()
 		{
 			return;
 		}

+		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
-