diff options
author | adityacp | 2020-04-27 15:04:31 +0530 |
---|---|---|
committer | adityacp | 2020-04-27 15:31:37 +0530 |
commit | b8636965de8a86e68fd542754678e6826c7e5eac (patch) | |
tree | 638930dd42140d760e443c0d35874de6e27b3ef9 /.travis.yml | |
parent | e3f73db877aaf2f6406bef39aee590530bcb503b (diff) | |
parent | 53a0c4ad3e733f3960000527f83565f2fd8fc412 (diff) | |
download | online_test-b8636965de8a86e68fd542754678e6826c7e5eac.tar.gz online_test-b8636965de8a86e68fd542754678e6826c7e5eac.tar.bz2 online_test-b8636965de8a86e68fd542754678e6826c7e5eac.zip |
Resolve conflicts in travis, requirements and views
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index e6fd3a4..09b262a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ install: before_script: - python manage.py makemigrations notifications_plugin + - python manage.py makemigrations - python manage.py migrate auth - python manage.py migrate |