s

myProject/Program.cs

@@ -43,5 +43,11 @@ namespace myProject
 		{
 
 		}
+
+		public void delete1()
+		{
+
+		}
+
 	}
 }

myProject/Program.cs.orig

+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace myProject
+{
+	public class Program
+	{
+		public static void Main(string[] args)
+		{
+			CreateWebHostBuilder(args).Build().Run();
+		}
+
+		public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+			WebHost.CreateDefaultBuilder(args)
+				.UseStartup<Startup>();
+
+
+		public void GetMessage()
+		{
+			return;
+		}
+
+		public void GetStatus()
+		{
+			if ("a".Equals("a"))
+			{
+				return;
+			}
+		}
+
+<<<<<<< HEAD
+		public void update()
+		{
+
+		}
+=======
+		public void add()
+		{
+		}
+
+>>>>>>> m101_bugfix
+	}
+}