From 02dc629aa2e696dbb8e493f57963f4befac875fe Mon Sep 17 00:00:00 2001
From: Laura Hawkins <lahawkin@ucsd.edu>
Date: Wed, 20 May 2015 12:53:40 -0700
Subject: [PATCH]  blue

---
 flashcards/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/flashcards/views.py b/flashcards/views.py
index 92575b9..11695ad 100644
--- a/flashcards/views.py
+++ b/flashcards/views.py
@@ -368,4 +368,3 @@ class UserFlashcardQuizViewSet(GenericViewSet, CreateModelMixin, UpdateModelMixi
         serializer.is_valid()
         serializer.update(user_flashcard_quiz, serializer.validated_data)
         return Response(status=HTTP_204_NO_CONTENT)
->>>>>>> 6713d6dc9f0ddfc99cc24a9b57194c0d5b032c91
-- 
1.9.1