fix: merge conflicts

demolaf · demolaf · commit 8e2606841051 · 2026-01-13T14:04:01.000+01:00
diff --git a/packages/googleapis_firestore/lib/src/bulk_writer.dart b/packages/googleapis_firestore/lib/src/bulk_writer.dart
@@ -912,4 +912,3 @@ class BulkWriter {
     _bulkCommitBatch = _BulkCommitBatch(firestore, size);
   }
 }
-
diff --git a/packages/googleapis_firestore/lib/src/firestore.dart b/packages/googleapis_firestore/lib/src/firestore.dart
@@ -14,7 +14,6 @@ import 'package:http/http.dart'
     show BaseRequest, StreamedResponse, ByteStream, BaseClient, Client;
 import 'package:intl/intl.dart';
 import 'package:meta/meta.dart';
-
 import 'backoff.dart';
 import 'environment.dart';
 
diff --git a/packages/googleapis_firestore/lib/src/rate_limiter.dart b/packages/googleapis_firestore/lib/src/rate_limiter.dart
@@ -115,4 +115,3 @@ class RateLimiter {
   @visibleForTesting
   int get maximumCapacity => _maximumCapacity;
 }
-

Original file line number	Diff line number	Diff line change
`@@ -912,4 +912,3 @@ class BulkWriter {`
`912`	`912`	`_bulkCommitBatch = _BulkCommitBatch(firestore, size);`
`913`	`913`	`}`
`914`	`914`	`}`
`915`		`-`
Original file line number	Diff line number	Diff line change
`@@ -115,4 +115,3 @@ class RateLimiter {`
`115`	`115`	`@visibleForTesting`
`116`	`116`	`int get maximumCapacity => _maximumCapacity;`
`117`	`117`	`}`
`118`		`-`