Fix an unresolved merge conflict

orlandos-nl · May 4, 2020 · edd525b · edd525b
1 parent a0ed627
commit edd525b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Sources/MongoKitten/CollectionHelpers/Collection+FindAndModify.swift b/Sources/MongoKitten/CollectionHelpers/Collection+FindAndModify.swift
@@ -133,7 +133,7 @@ public final class FindAndModifyBuilder {
                                       sessionId: self.collection.sessionId ?? connection.implicitSessionId)
 
         }
-        .decode(FindAndModifyReply.self)
+        .decodeReply(FindAndModifyReply.self)
         ._mongoHop(to: self.collection.hoppedEventLoop)
     }
 

diff --git a/Sources/MongoKitten/CollectionHelpers/Collection+Indexes.swift b/Sources/MongoKitten/CollectionHelpers/Collection+Indexes.swift
@@ -40,7 +40,7 @@ extension MongoCollection {
                 request,
                 namespace: namespace,
                 sessionId: nil
-            ).decode(MongoCursorResponse.self).map { response in
+            ).decodeReply(MongoCursorResponse.self).map { response in
                 return MongoCursor(
                     reply: response.cursor,
                     in: namespace,