Skip to content

M
myproject
Commit 552d19d1 authored by 叶海龙's avatar 叶海龙
Browse files
Options

fix conlict

parents 462ebf48 2560a5eb
Pipeline #100 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 9 additions and 1 deletion
      myProject/Program.cs
      View file @ 552d19d1
      ...@@ -21,10 +21,19 @@ namespace myProject ...@@ -21,10 +21,19 @@ namespace myProject
      WebHost.CreateDefaultBuilder(args) WebHost.CreateDefaultBuilder(args)
      .UseStartup<Startup>(); .UseStartup<Startup>();
      public void GetMessage() public void GetMessage()
      { {
      return; return;
      } }
      public void GetStatus()
      {
      if ("a".Equals("a"))
      {
      return;
      }
      }
      } }
      } }
      myProject/TextFile.txt
      View file @ 552d19d1
      ...@@ -3,4 +3,3 @@ ...@@ -3,4 +3,3 @@
      484849848 484849848
      98456 98456
      myname is yehailong myname is yehailong
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment