Skip to content

Commit f5700cd

Browse files
committed
Merge branch 'api-definition' of https://github.com/firebase/firebase-js-sdk into api-definition
2 parents 9435a16 + 0e1e4c9 commit f5700cd

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

packages/remote-config/src/client/realtime_handler.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,23 @@ export class RealtimeHandler{
3030
*/
3131
public addObserver(observer: ConfigUpdateObserver) {
3232
this.observers.add(observer);
33-
this.beginRealtime();
33+
<<<<<<< HEAD
34+
his.beginRealtime();
35+
=======
36+
this.begineRealtime();
37+
>>>>>>> 0e1e4c98f94a55cb8a96ba07f2ec5c8059266e67
3438
}
3539
/**
3640
* Removes an observer from the realtime updates.
3741
* @param observer The observer to remove.
3842
*/
3943
public removeObserver(observer: ConfigUpdateObserver): void {
4044
if (this.observers.has(observer)) {
45+
<<<<<<< HEAD
4146
this.observers.delete(observer);
47+
=======
48+
return this.observers.delete(observer);
49+
>>>>>>> 0e1e4c98f94a55cb8a96ba07f2ec5c8059266e67
4250
}
4351
}
4452

0 commit comments

Comments
 (0)