after merge fixes

shakurocom · Jul 12, 2021 · f642d4b · f642d4b
1 parent 600987e
commit f642d4b
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 88 deletions.
diff --git a/Source/Operation/DependentOperation.swift b/Source/Operation/DependentOperation.swift
@@ -6,16 +6,9 @@
 import Foundation
 import Shakuro_CommonTypes
 
-<<<<<<< HEAD
 internal protocol DependencyProtocol: AnyObject {
-    /**
-     See `DependencyResult` for description.
-     */
-=======
-internal protocol DependencyProtocol: class {
 
     /// See `DependencyResult` for description.
->>>>>>> 9e9e86c2f9ca4de316f7ae87489d538d43f41216
     func dependencyResult() -> CancellableAsyncResult<Void>?
 
 }

diff --git a/Source/Operation/TaskOperation.swift b/Source/Operation/TaskOperation.swift
@@ -6,11 +6,7 @@
 import Foundation
 import Shakuro_CommonTypes
 
-<<<<<<< HEAD
-public protocol AsyncCompletionProtocol: AnyObject {
-=======
-public protocol OperationHashProtocol: class {
->>>>>>> 9e9e86c2f9ca4de316f7ae87489d538d43f41216
+public protocol OperationHashProtocol: AnyObject {
 
     /// Unique identifier of operation. Consists of `type(of: self)` + `options.optionsHash()`.
     /// Used in `TaskManager.willPerformOperation()` to resolve operations dependencies.