tests

2 files changed, 1 insertions, 23 deletions

diff --git a/doc/mapper spec.md b/doc/mapper spec.md
index 725a0d6b2..db77da5db 100644
--- a/doc/mapper spec.md
+++ b/doc/mapper spec.md
@@ -36,20 +36,13 @@ request: get all items of a feed of a user (unread and read)
 
 
 all requests: can be specified using an (offset (id), limit) or (updatedSince (timestamp))
-=======
-findAllFromUser($userId)
-find(int $feedId, $userId)
 
-findAll($status, $feedId, $userId, );
->>>>>>> Stashed changes
+
 
 foldermapper
 
 find($feedId, $userId)
-<<<<<<< Updated upstream
 findAllFromUser($userId)
-=======
->>>>>>> Stashed changes
 
 feedmapper
 
diff --git a/doc/mapper spec.md~ b/doc/mapper spec.md~
deleted file mode 100644
index a5e877734..000000000
--- a/doc/mapper spec.md~
+++ /dev/null
@@ -1,15 +0,0 @@
-
-findAllFromUser($userId)
-find(int $feedId, $userId)
-findAllFromFeedWithStatus($status, $feedId, $userId);
-
-foldermapper
-
-find($feedId, $userId)
-
-feedmapper
-
-find($feedId, $userId)
-findAll()
-findAllFromUser($userId)
-