Rebase fixes.

Author: tjprescott

src/dotnet/APIView/ClientSPA/angular.json

@@ -56,12 +56,7 @@
           },
           "configurations": {
             "production": {
-<<<<<<< HEAD
-              "baseHref": "/",
-              "deployUrl": "/spa/",
-=======
               "baseHref": "/spa/browser/",
->>>>>>> 63a013751 (Update paths.)
               "budgets": [
                 {
                   "type": "initial",
@@ -93,6 +88,7 @@
         },
         "serve": {
           "builder": "@angular/build:dev-server",
+          "options": {},
           "configurations": {
             "production": {
               "buildTarget": "ClientAPP:build:production"