fix merge conflicts

Author: rxlabz

dart/lib/sentry.dart

@@ -8,6 +8,5 @@ export 'src/protocol.dart';
 export 'src/scope.dart';
 export 'src/sentry.dart';
 export 'src/sentry_options.dart';
-export 'src/sentry_options.dart';
 export 'src/transport/transport.dart';
 export 'src/version.dart';

dart/lib/src/client.dart

@@ -120,7 +120,8 @@ abstract class SentryClient {
     return event;
   }
 
-  Event _applyScope({@required Event event, @required Scope scope}) {
+  SentryEvent _applyScope(
+      {@required SentryEvent event, @required Scope scope}) {
     if (scope != null) {
       // Merge the scope transaction.
       if (event.transaction == null) {

dart/lib/src/transport/transport.dart

@@ -3,10 +3,10 @@ import 'dart:convert';
 
 import 'package:http/http.dart';
 import 'package:meta/meta.dart';
-import 'package:sentry/sentry.dart';
 import 'package:sentry/src/utils.dart';
 
 import '../protocol.dart';
+import '../sentry_options.dart';
 import 'body_encoder_browser.dart' if (dart.library.io) 'body_encoder.dart';
 
 typedef BodyEncoder = List<int> Function(
@@ -17,9 +17,6 @@ typedef BodyEncoder = List<int> Function(
 
 typedef HeadersBuilder = Map<String, String> Function(String authHeader);
 
-/// Used to provide timestamp for logging.
-typedef ClockProvider = DateTime Function();
-
 /// A transport is in charge of sending the event to the Sentry server.
 class Transport {
   final Client httpClient;