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