Skip to content

Commit 6d5210f

Browse files
committed
feat(google-maps): Expost the underlying Google Maps objects.
Correct package.json file with correct version.
1 parent 67e6bf9 commit 6d5210f

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

package.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,25 +45,14 @@
4545
},
4646
"version": "9.2.0",
4747
"dependencies": {
48-
<<<<<<< HEAD
4948
"@angular/animations": "^9.1.0",
5049
"@angular/common": "^9.1.0",
5150
"@angular/compiler": "^9.1.0",
5251
"@angular/core": "^9.1.0",
5352
"@angular/elements": "^9.1.0",
5453
"@angular/forms": "^9.1.0",
5554
"@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",
6555
"@types/googlemaps": "^3.39.3",
66-
>>>>>>> 466c757d7... feat(google-maps): expose the underlying Google Maps objects.
6756
"@types/youtube": "^0.0.38",
6857
"@webcomponents/custom-elements": "^1.1.0",
6958
"core-js": "^2.6.9",

0 commit comments

Comments
 (0)