change ports in start

angular.json

@@ -154,12 +154,8 @@
         },
         "serve": {
           "options": {
-<<<<<<< HEAD
-            "allowedHosts": ["novo.market", "dexarmarket.ru", "dexar.market","localhost"]
-=======
             "allowedHosts": ["novo.market", "dexarmarket.ru", "localhost"],
             "proxyConfig": "proxy.conf.json"
->>>>>>> 97214c3a90e09df2e2916cca3ffc2dc71ee4f990
           },
           "builder": "@angular/build:dev-server",
           "configurations": {
@@ -185,3 +181,4 @@
     }
   }
 }
+

package.json

@@ -16,15 +16,6 @@
   },
   "private": true,
   "dependencies": {
-<<<<<<< HEAD
-    "@angular/common": "^21.1.0",
-    "@angular/compiler": "^21.1.0",
-    "@angular/core": "^21.1.0",
-    "@angular/forms": "^21.1.0",
-    "@angular/platform-browser": "^21.1.0",
-    "@angular/router": "^21.1.0",
-    "@angular/service-worker": "^21.1.0",
-=======
     "@angular/animations": "^21.1.5",
     "@angular/cdk": "^21.1.5",
     "@angular/common": "^21.0.6",
@@ -36,7 +27,6 @@
     "@angular/platform-browser-dynamic": "^21.1.5",
     "@angular/router": "^21.0.6",
     "@angular/service-worker": "^21.0.6",
->>>>>>> 97214c3a90e09df2e2916cca3ffc2dc71ee4f990
     "primeicons": "^7.0.0",
     "primeng": "^21.0.3",
     "rxjs": "~7.8.0",
@@ -44,9 +34,9 @@
     "zone.js": "~0.16.0"
   },
   "devDependencies": {
-    "@angular/build": "^21.1.0",
-    "@angular/cli": "^21.1.0",
-    "@angular/compiler-cli": "^21.1.0",
+    "@angular/build": "^21.0.6",
+    "@angular/cli": "^21.0.6",
+    "@angular/compiler-cli": "^21.0.6",
     "@types/jasmine": "~5.1.0",
     "jasmine-core": "~5.13.0",
     "karma": "~6.4.0",
@@ -57,3 +47,4 @@
     "typescript": "~5.9.3"
   }
 }
+

start

@@ -1,2 +1,2 @@
-pm2 start "ng serve --configuration=novo --host 127.0.0.1 --port 4000" --name novo-market
-pm2 start "ng serve --host 127.0.0.1 --port 3000" --name dexar-market
+pm2 start "ng serve --configuration=novo --host 127.0.0.1 --port 4010" --name novo-market
+pm2 start "ng serve --host 127.0.0.1 --port 4001" --name dexar-market