Skip to content

Commit 56414e8

Browse files
committed
Merge branch 'release'
Release 6.2.3
1 parent 00cb964 commit 56414e8

File tree

9 files changed

+0
-48
lines changed

9 files changed

+0
-48
lines changed

integration/browserify/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
<<<<<<< HEAD
11-
"firebase": "6.2.2"
12-
=======
1310
"firebase": "6.2.3"
14-
>>>>>>> release
1511
},
1612
"devDependencies": {
1713
"@babel/core": "7.4.4",

integration/firebase-typings/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
"test": "tsc index.ts --outDir dist"
77
},
88
"dependencies": {
9-
<<<<<<< HEAD
10-
"firebase": "6.2.2"
11-
=======
129
"firebase": "6.2.3"
13-
>>>>>>> release
1410
},
1511
"devDependencies": {
1612
"typescript": "3.4.5"

integration/messaging/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
"test:manual": "mocha --exit"
99
},
1010
"dependencies": {
11-
<<<<<<< HEAD
12-
"firebase": "6.2.2"
13-
=======
1411
"firebase": "6.2.3"
15-
>>>>>>> release
1612
},
1713
"devDependencies": {
1814
"chai": "4.2.0",

integration/typescript/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
"test": "karma start --single-run"
77
},
88
"dependencies": {
9-
<<<<<<< HEAD
10-
"firebase": "6.2.2"
11-
=======
129
"firebase": "6.2.3"
13-
>>>>>>> release
1410
},
1511
"devDependencies": {
1612
"@babel/core": "7.4.4",

integration/webpack/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
<<<<<<< HEAD
11-
"firebase": "6.2.2"
12-
=======
1310
"firebase": "6.2.3"
14-
>>>>>>> release
1511
},
1612
"devDependencies": {
1713
"@babel/core": "7.4.4",

packages/app/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@firebase/app",
3-
<<<<<<< HEAD
4-
"version": "0.4.7",
5-
=======
63
"version": "0.4.8",
7-
>>>>>>> release
84
"description": "The primary entrypoint to the Firebase JS SDK",
95
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
106
"main": "dist/index.node.cjs.js",

packages/firebase/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "firebase",
3-
<<<<<<< HEAD
4-
"version": "6.2.2",
5-
=======
63
"version": "6.2.3",
7-
>>>>>>> release
84
"description": "Firebase JavaScript library for web and Node.js",
95
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
106
"license": "Apache-2.0",
@@ -41,11 +37,7 @@
4137
"module": "dist/index.esm.js",
4238
"react-native": "dist/index.rn.cjs.js",
4339
"dependencies": {
44-
<<<<<<< HEAD
45-
"@firebase/app": "0.4.7",
46-
=======
4740
"@firebase/app": "0.4.8",
48-
>>>>>>> release
4941
"@firebase/app-types": "0.4.0",
5042
"@firebase/auth": "0.11.3",
5143
"@firebase/database": "0.4.6",

packages/rxfire/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "rxfire",
3-
<<<<<<< HEAD
4-
"version": "3.6.2",
5-
=======
63
"version": "3.6.3",
7-
>>>>>>> release
84
"private": false,
95
"description": "Firebase JavaScript library RxJS",
106
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -40,11 +36,7 @@
4036
"rxjs": "6.x.x"
4137
},
4238
"devDependencies": {
43-
<<<<<<< HEAD
44-
"firebase": "6.2.2",
45-
=======
4639
"firebase": "6.2.3",
47-
>>>>>>> release
4840
"rxjs": "^6.5.1",
4941
"rollup": "1.11.0",
5042
"rollup-plugin-commonjs": "9.3.4",

packages/testing/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "@firebase/testing",
3-
<<<<<<< HEAD
4-
"version": "0.11.2",
5-
=======
63
"version": "0.11.3",
7-
>>>>>>> release
84
"description": "",
95
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
106
"main": "dist/index.cjs.js",
@@ -19,11 +15,7 @@
1915
},
2016
"license": "Apache-2.0",
2117
"dependencies": {
22-
<<<<<<< HEAD
23-
"firebase": "6.2.2",
24-
=======
2518
"firebase": "6.2.3",
26-
>>>>>>> release
2719
"@firebase/logger": "0.1.17",
2820
"@firebase/util": "0.2.20",
2921
"@types/request": "2.48.1",

0 commit comments

Comments
 (0)