Skip to content

Commit c3cc79a

Browse files
committed
fix merge
1 parent f89ea76 commit c3cc79a

File tree

2 files changed

+0
-34
lines changed

2 files changed

+0
-34
lines changed
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
/*
2-
<<<<<<<< HEAD:FirebaseFirestoreInternal/FirebaseFirestore/FIRPipelineBridge.h
3-
* Copyright 2025 Google LLC
4-
========
52
* Copyright 2021 Google LLC
6-
>>>>>>>> main:FirebaseAnalyticsCoreWrapper/include/dummy.h
73
*
84
* Licensed under the Apache License, Version 2.0 (the "License");
95
* you may not use this file except in compliance with the License.
@@ -18,9 +14,5 @@
1814
* limitations under the License.
1915
*/
2016

21-
<<<<<<<< HEAD:FirebaseFirestoreInternal/FirebaseFirestore/FIRPipelineBridge.h
22-
#import <FirebaseFirestoreInternal/FIRPipelineBridge.h>
23-
========
2417
// Swift Package Manager needs at least one header to prevent a warning. See
2518
// https://github.com/firebase/firebase-ios-sdk/pull/6504.
26-
>>>>>>>> main:FirebaseAnalyticsCoreWrapper/include/dummy.h

FirebaseFirestoreInternal/FirebaseFirestore/FIRPipelineBridge.h

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)