merge报错

4 weeks ago · ff0261945b
2 changed files with 4 additions and 1 deletions
--- a/.gitnexusignore
+++ b/.gitnexusignore
@ -6,4 +6,5 @@ temp/
 .cache/
 .env
 bin/
-obj/
+obj/
 .git/
--- a/Build_God_Api/Build_God_Api/Program.cs
+++ b/Build_God_Api/Build_God_Api/Program.cs
@ -182,6 +182,8 @@ namespace Build_God_Api
                });
            });
            builder.WebHost.UseUrls("http://localhost:5091");
            var app = builder.Build();
            // Configure the HTTP request pipeline.
 .cache/
 .env
 bin/
 obj/
+.git/