Commit fa34dcd5f150dabfb932ba5f6c407425ca47c1f2
1 parent
1acf45a73e
Exists in
master
fixed merge thing
Showing 1 changed file with 0 additions and 5 deletions Side-by-side Diff
flashcards/views.py
View file @
fa34dcd
| ... | ... | @@ -30,13 +30,8 @@ |
| 30 | 30 | Gets flashcards for a section, excluding hidden cards. |
| 31 | 31 | Returned in strictly chronological order (material date). |
| 32 | 32 | """ |
| 33 | -<<<<<<< HEAD | |
| 34 | 33 | flashcards = Flashcard.cards_visible_to(request.user).filter( \ |
| 35 | 34 | section=self.get_object()).all() |
| 36 | - | |
| 37 | -======= | |
| 38 | - flashcards = Flashcard.cards_visible_to(request.user).filter(section=self.get_object()) | |
| 39 | ->>>>>>> 41819dd7ec2f22a04db83459c33e31c2b7d16d99 | |
| 40 | 35 | return Response(FlashcardSerializer(flashcards, many=True).data) |
| 41 | 36 | |
| 42 | 37 | @detail_route(methods=['post'], permission_classes=[IsAuthenticated]) |