diff options
| author | Alwin1847207 | 2019-11-04 17:26:27 +0530 |
|---|---|---|
| committer | Alwin1847207 | 2019-11-04 17:26:27 +0530 |
| commit | 6c741569e8ef73fe1e8773419f241891dd69a1ad (patch) | |
| tree | 5c5ff33906492582109d1b8076b699be8acd5d92 /fossee_manim/views.py | |
| parent | 7c650b158109a9d59882365d26f0327390268f13 (diff) | |
| download | FOSSEE_animations-6c741569e8ef73fe1e8773419f241891dd69a1ad.tar.gz FOSSEE_animations-6c741569e8ef73fe1e8773419f241891dd69a1ad.tar.bz2 FOSSEE_animations-6c741569e8ef73fe1e8773419f241891dd69a1ad.zip | |
removed merge conflicts
Diffstat (limited to 'fossee_manim/views.py')
| -rw-r--r-- | fossee_manim/views.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fossee_manim/views.py b/fossee_manim/views.py index 3ea851e..b8ab7b0 100644 --- a/fossee_manim/views.py +++ b/fossee_manim/views.py @@ -3,7 +3,7 @@ from .forms import ( UserRegistrationForm, UserLoginForm, ProfileForm, AnimationProposal, CommentForm, UploadAnimationForm, - AnimationProposal_edit + AnimationProposal_edit, ) from .models import ( Profile, User, AnimationStats, |