File tree Expand file tree Collapse file tree 2 files changed +0
-34
lines changed
FirebaseAnalyticsCoreWrapper/include
FirebaseFirestoreInternal/FirebaseFirestore Expand file tree Collapse file tree 2 files changed +0
-34
lines changed Original file line number Diff line number Diff line change 1
1
/*
2
- <<<<<<<< HEAD:FirebaseFirestoreInternal/FirebaseFirestore/FIRPipelineBridge.h
3
- * Copyright 2025 Google LLC
4
- ========
5
2
* Copyright 2021 Google LLC
6
- >>>>>>>> main:FirebaseAnalyticsCoreWrapper/include/dummy.h
7
3
*
8
4
* Licensed under the Apache License, Version 2.0 (the "License");
9
5
* you may not use this file except in compliance with the License.
18
14
* limitations under the License.
19
15
*/
20
16
21
- <<<<<<<< HEAD:FirebaseFirestoreInternal/FirebaseFirestore/FIRPipelineBridge.h
22
- #import < FirebaseFirestoreInternal/FIRPipelineBridge.h>
23
- ========
24
17
// Swift Package Manager needs at least one header to prevent a warning. See
25
18
// https://github.com/firebase/firebase-ios-sdk/pull/6504.
26
- >>>>>>>> main:FirebaseAnalyticsCoreWrapper/include/dummy.h
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments