chore: update readme

Signed-off-by: Michael Beemer <[email protected]>

Author: beeme1mr

lib/feature_provider.dart

@@ -11,11 +11,7 @@ enum ProviderState {
   DEGRADED,
   RECONNECTING,
   PLUGIN_ERROR,
-<<<<<<< HEAD
   MAINTENANCE,
-=======
-  MAINTENANCE
->>>>>>> ba2a59e (chore: move code into the root directory (#32))
 }
 
 /// Provider configuration
@@ -122,11 +118,7 @@ class InMemoryProvider implements FeatureProvider {
   final ProviderConfig _config;
 
   InMemoryProvider(this._flags, [ProviderConfig? config])
-<<<<<<< HEAD
     : _config = config ?? const ProviderConfig();
-=======
-      : _config = config ?? const ProviderConfig();
->>>>>>> ba2a59e (chore: move code into the root directory (#32))
 
   @override
   String get name => 'InMemoryProvider';
@@ -265,11 +257,4 @@ abstract class CommercialProvider implements FeatureProvider {
   ProviderState get state => _state;
 
   // HTTP request implementation template
-<<<<<<< HEAD
-=======
-  Future<dynamic> _makeRequest(String path,
-      {Map<String, dynamic>? params}) async {
-    throw UnimplementedError('_makeRequest must be implemented by child class');
-  }
->>>>>>> ba2a59e (chore: move code into the root directory (#32))
 }

lib/transaction_context.dart

@@ -35,21 +35,12 @@ class TransactionContext {
 /// Transaction context manager
 class TransactionContextManager {
   static final TransactionContextManager _instance =
-<<<<<<< HEAD
       TransactionContextManager._internal(Duration(minutes: 5));
-=======
-      TransactionContextManager._internal();
->>>>>>> ba2a59e (chore: move code into the root directory (#32))
   final _contexts = <String, TransactionContext>{};
   final _contextStack = <String>[];
   final Duration _defaultTimeout;
 
-<<<<<<< HEAD
   TransactionContextManager._internal(this._defaultTimeout);
-=======
-  TransactionContextManager._internal(
-      [this._defaultTimeout = const Duration(minutes: 30)]);
->>>>>>> ba2a59e (chore: move code into the root directory (#32))
 
   factory TransactionContextManager() => _instance;