diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-20 19:05:56 +0100 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-20 19:06:17 +0100 |
commit | 8f215ec03ba57e51dbbfef004069fb1e63c8fca1 (patch) | |
tree | 21bc3a85b59d05054f5834714b5ce80ab01745dc /doc | |
parent | eacd2a1755137d3016dad7177c06dc57ca033ccb (diff) |
tests
Diffstat (limited to 'doc')
-rw-r--r-- | doc/mapper spec.md | 9 | ||||
-rw-r--r-- | doc/mapper spec.md~ | 15 |
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) - |