110swag / flashy-backend

Download as
Browse Code ยป

Commit 89d5997de2117039b58f90fd31945a22907f1fe5

Authored by Laura Hawkins
2 parents 4577098f09 575b144dbc
Exists in master

Merge branch 'master' of https://git.ucsd.edu/110swag/flashy-backend 

Conflicts:
	flashy/flashcards/models.py

Showing 1 changed file Side-by-side Diff

flashy/flashcards/models.py View file @ 89d5997
... ... @@ -11,8 +11,6 @@
11 11 flashcard = models.ForeignKey(Flashcard)
12 12 pulled = models.DateTimeField('date pulled')
13 13 unpulled = model.DateTimeField('date unpulled')
14   -
15   -
16 14 #comment
17 15  
18 16 class FlashcardMask(models.Model):