cherylEnkidu 9 mesi fa
parent
commit
c3cc79ace2

+ 0 - 8
FirebaseAnalyticsCoreWrapper/include/dummy.h

@@ -1,9 +1,5 @@
 /*
-<<<<<<<< HEAD:FirebaseFirestoreInternal/FirebaseFirestore/FIRPipelineBridge.h
- * Copyright 2025 Google LLC
-========
  * Copyright 2021 Google LLC
->>>>>>>> main:FirebaseAnalyticsCoreWrapper/include/dummy.h
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +14,5 @@
  * limitations under the License.
  */
 
-<<<<<<<< HEAD:FirebaseFirestoreInternal/FirebaseFirestore/FIRPipelineBridge.h
-#import <FirebaseFirestoreInternal/FIRPipelineBridge.h>
-========
 // Swift Package Manager needs at least one header to prevent a warning. See
 // https://github.com/firebase/firebase-ios-sdk/pull/6504.
->>>>>>>> main:FirebaseAnalyticsCoreWrapper/include/dummy.h

+ 0 - 26
FirebaseFirestoreInternal/FirebaseFirestore/FIRPipelineBridge.h

@@ -1,26 +0,0 @@
-/*
-<<<<<<<< HEAD:FirebaseFirestoreInternal/FirebaseFirestore/FIRPipelineBridge.h
- * Copyright 2025 Google LLC
-========
- * Copyright 2021 Google LLC
->>>>>>>> main:FirebaseAnalyticsCoreWrapper/include/dummy.h
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-<<<<<<<< HEAD:FirebaseFirestoreInternal/FirebaseFirestore/FIRPipelineBridge.h
-#import <FirebaseFirestoreInternal/FIRPipelineBridge.h>
-========
-// Swift Package Manager needs at least one header to prevent a warning. See
-// https://github.com/firebase/firebase-ios-sdk/pull/6504.
->>>>>>>> main:FirebaseAnalyticsCoreWrapper/include/dummy.h