package

dd97ae71 · sunchao · 3c4359ca · dd97ae71
Commit dd97ae71 authored Jun 30, 2020 by sunchao
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

package.json
+0 -5

No files found.
--- a/package.json
+++ b/package.json
@@ -3,15 +3,10 @@
  "version": "0.0.0",
  "scripts": {
    "ng": "ng",
-<<<<<<< HEAD
-    "start": "ng serve --host 92.168.124.107",
-    "build": "ng build -c=dev --prod",
-=======
    "start": "ng serve --host 192.168.1.25",
    "buildDev": "ng build -c=dev --prod",
    "buildStage": "ng build -c=stage --prod",
    "buildProd": "ng build -c=production --prod ",
->>>>>>> 4f8fb7e80361458ea1e7ade090f45db97384e20b
    "test": "ng test",
    "lint": "ng lint",
    "e2e": "ng e2e"