Commit 1ce3fe3
release: 1.3.0-rc.2
1 parent 0bb29fa commit 1ce3fe3
3 files changed
Lines changed: 7 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,6 @@ | |||
| 1 | 1 | { | |
| 2 | 2 | "name": "@angular/cli", | |
| 3 | - "version": "1.3.0-rc.0", | ||
| 3 | + "version": "1.3.0-rc.2", | ||
| 4 | 4 | "description": "CLI tool for Angular", | |
| 5 | 5 | "main": "packages/@angular/cli/lib/cli/index.js", | |
| 6 | 6 | "trackingCode": "UA-8594346-19", | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,6 @@ | |||
| 1 | 1 | { | |
| 2 | 2 | "name": "@angular/cli", | |
| 3 | - "version": "1.3.0-rc.0", | ||
| 3 | + "version": "1.3.0-rc.2", | ||
| 4 | 4 | "description": "CLI tool for Angular", | |
| 5 | 5 | "main": "lib/cli/index.js", | |
| 6 | 6 | "trackingCode": "UA-8594346-19", | |
@@ -29,7 +29,7 @@ | |||
| 29 | 29 | "dependencies": { | |
| 30 | 30 | "@angular-devkit/build-optimizer": "0.0.3", | |
| 31 | 31 | "@ngtools/json-schema": "1.1.0", | |
| 32 | - "@ngtools/webpack": "1.6.0-rc.0", | ||
| 32 | + "@ngtools/webpack": "1.6.0-rc.2", | ||
| 33 | 33 | "autoprefixer": "^6.5.3", | |
| 34 | 34 | "chalk": "^2.0.1", | |
| 35 | 35 | "circular-dependency-plugin": "^3.0.0", | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,10 @@ | |||
| 1 | 1 | { | |
| 2 | 2 | "name": "@ngtools/webpack", | |
| 3 | + <<<<<<< HEAD | ||
| 3 | 4 | "version": "1.6.0-rc.0", | |
| 5 | + ======= | ||
| 6 | + "version": "1.6.0-rc.2", | ||
| 7 | + >>>>>>> 453f75f5... release: 1.3.0-rc.2 | ||
| 4 | 8 | "description": "Webpack plugin that AoT compiles your Angular components and modules.", | |
| 5 | 9 | "main": "./src/index.js", | |
| 6 | 10 | "typings": "src/index.d.ts", | |
0 commit comments