|
47 | 47 | },
|
48 | 48 | "version": "9.2.0",
|
49 | 49 | "dependencies": {
|
50 |
| -<<<<<<< HEAD |
51 | 50 | "@angular/animations": "^9.1.0",
|
52 | 51 | "@angular/common": "^9.1.0",
|
53 | 52 | "@angular/compiler": "^9.1.0",
|
54 | 53 | "@angular/core": "^9.1.0",
|
55 | 54 | "@angular/elements": "^9.1.0",
|
56 | 55 | "@angular/forms": "^9.1.0",
|
57 | 56 | "@angular/platform-browser": "^9.1.0",
|
58 |
| - "@types/googlemaps": "^3.37.0", |
59 |
| -======= |
60 |
| - "@angular/animations": "^9.1.0-next.4", |
61 |
| - "@angular/common": "^9.1.0-next.4", |
62 |
| - "@angular/compiler": "^9.1.0-next.4", |
63 |
| - "@angular/core": "^9.1.0-next.4", |
64 |
| - "@angular/elements": "^9.1.0-next.4", |
65 |
| - "@angular/forms": "^9.1.0-next.4", |
66 |
| - "@angular/platform-browser": "^9.1.0-next.4", |
67 | 57 | "@types/googlemaps": "^3.39.3",
|
68 |
| ->>>>>>> 466c757d7... feat(google-maps): expose the underlying Google Maps objects. |
69 | 58 | "@types/youtube": "^0.0.38",
|
70 | 59 | "@webcomponents/custom-elements": "^1.1.0",
|
71 | 60 | "core-js": "^2.6.9",
|
|
0 commit comments