From 8f215ec03ba57e51dbbfef004069fb1e63c8fca1 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Wed, 20 Mar 2013 19:05:56 +0100
Subject: tests

---
 doc/mapper spec.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'doc/mapper spec.md')

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
 
-- 
cgit v1.2.3