File tree Expand file tree Collapse file tree 9 files changed +48
-0
lines changed Expand file tree Collapse file tree 9 files changed +48
-0
lines changed Original file line number Diff line number Diff line change 7
7
"test" : " karma start --single-run"
8
8
},
9
9
"dependencies" : {
10
+ <<<<<<< HEAD
10
11
"firebase" : " 6.2.2"
12
+ =======
13
+ "firebase" : " 6.2.3"
14
+ >>>>>>> release
11
15
},
12
16
"devDependencies" : {
13
17
"@babel/core" : " 7.4.4" ,
Original file line number Diff line number Diff line change 6
6
"test" : " tsc index.ts --outDir dist"
7
7
},
8
8
"dependencies" : {
9
+ <<<<<<< HEAD
9
10
"firebase" : " 6.2.2"
11
+ =======
12
+ "firebase" : " 6.2.3"
13
+ >>>>>>> release
10
14
},
11
15
"devDependencies" : {
12
16
"typescript" : " 3.4.5"
Original file line number Diff line number Diff line change 8
8
"test:manual" : " mocha --exit"
9
9
},
10
10
"dependencies" : {
11
+ <<<<<<< HEAD
11
12
"firebase" : " 6.2.2"
13
+ =======
14
+ "firebase" : " 6.2.3"
15
+ >>>>>>> release
12
16
},
13
17
"devDependencies" : {
14
18
"chai" : " 4.2.0" ,
Original file line number Diff line number Diff line change 6
6
"test" : " karma start --single-run"
7
7
},
8
8
"dependencies" : {
9
+ <<<<<<< HEAD
9
10
"firebase" : " 6.2.2"
11
+ =======
12
+ "firebase" : " 6.2.3"
13
+ >>>>>>> release
10
14
},
11
15
"devDependencies" : {
12
16
"@babel/core" : " 7.4.4" ,
Original file line number Diff line number Diff line change 7
7
"test" : " karma start --single-run"
8
8
},
9
9
"dependencies" : {
10
+ <<<<<<< HEAD
10
11
"firebase" : " 6.2.2"
12
+ =======
13
+ "firebase" : " 6.2.3"
14
+ >>>>>>> release
11
15
},
12
16
"devDependencies" : {
13
17
"@babel/core" : " 7.4.4" ,
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " @firebase/app" ,
3
+ <<<<<<< HEAD
3
4
"version" : " 0.4.7" ,
5
+ =======
6
+ "version" : " 0.4.8" ,
7
+ >>>>>>> release
4
8
"description" : " The primary entrypoint to the Firebase JS SDK" ,
5
9
"author" :
" Firebase <[email protected] > (https://firebase.google.com/)" ,
6
10
"main" : " dist/index.node.cjs.js" ,
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " firebase" ,
3
+ <<<<<<< HEAD
3
4
"version" : " 6.2.2" ,
5
+ =======
6
+ "version" : " 6.2.3" ,
7
+ >>>>>>> release
4
8
"description" : " Firebase JavaScript library for web and Node.js" ,
5
9
"author" :
" Firebase <[email protected] > (https://firebase.google.com/)" ,
6
10
"license" : " Apache-2.0" ,
37
41
"module" : " dist/index.esm.js" ,
38
42
"react-native" : " dist/index.rn.cjs.js" ,
39
43
"dependencies" : {
44
+ <<<<<<< HEAD
40
45
"@firebase/app" : " 0.4.7" ,
46
+ =======
47
+ "@firebase/app" : " 0.4.8" ,
48
+ >>>>>>> release
41
49
"@firebase/app-types" : " 0.4.0" ,
42
50
"@firebase/auth" : " 0.11.3" ,
43
51
"@firebase/database" : " 0.4.6" ,
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " rxfire" ,
3
+ <<<<<<< HEAD
3
4
"version" : " 3.6.2" ,
5
+ =======
6
+ "version" : " 3.6.3" ,
7
+ >>>>>>> release
4
8
"private" : false ,
5
9
"description" : " Firebase JavaScript library RxJS" ,
6
10
"author" :
" Firebase <[email protected] > (https://firebase.google.com/)" ,
36
40
"rxjs" : " 6.x.x"
37
41
},
38
42
"devDependencies" : {
43
+ <<<<<<< HEAD
39
44
"firebase" : " 6.2.2" ,
45
+ =======
46
+ "firebase" : " 6.2.3" ,
47
+ >>>>>>> release
40
48
"rxjs" : " ^6.5.1" ,
41
49
"rollup" : " 1.11.0" ,
42
50
"rollup-plugin-commonjs" : " 9.3.4" ,
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " @firebase/testing" ,
3
+ <<<<<<< HEAD
3
4
"version" : " 0.11.2" ,
5
+ =======
6
+ "version" : " 0.11.3" ,
7
+ >>>>>>> release
4
8
"description" : " " ,
5
9
"author" :
" Firebase <[email protected] > (https://firebase.google.com/)" ,
6
10
"main" : " dist/index.cjs.js" ,
15
19
},
16
20
"license" : " Apache-2.0" ,
17
21
"dependencies" : {
22
+ <<<<<<< HEAD
18
23
"firebase" : " 6.2.2" ,
24
+ =======
25
+ "firebase" : " 6.2.3" ,
26
+ >>>>>>> release
19
27
"@firebase/logger" : " 0.1.17" ,
20
28
"@firebase/util" : " 0.2.20" ,
21
29
"@types/request" : " 2.48.1" ,
You can’t perform that action at this time.
0 commit comments