diff options
| author | adityacp | 2017-04-27 18:37:19 +0530 |
|---|---|---|
| committer | adityacp | 2017-04-27 18:37:19 +0530 |
| commit | 624e752684125aa525d9b3643cbd7c9b7ba61682 (patch) | |
| tree | 726da35ba55acacfde255e31bdc2233600f75395 /requirements/requirements-common.txt | |
| parent | b191455c7d9b0f6c3548da174a68c8ab8052abf0 (diff) | |
| parent | 2694fd6dd4d37a1a6570792e234998feef21edca (diff) | |
| download | online_test-624e752684125aa525d9b3643cbd7c9b7ba61682.tar.gz online_test-624e752684125aa525d9b3643cbd7c9b7ba61682.tar.bz2 online_test-624e752684125aa525d9b3643cbd7c9b7ba61682.zip | |
Remove conflicts from views after rebase
Diffstat (limited to 'requirements/requirements-common.txt')
| -rw-r--r-- | requirements/requirements-common.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt index e04c5bd..53a44a4 100644 --- a/requirements/requirements-common.txt +++ b/requirements/requirements-common.txt @@ -5,3 +5,4 @@ python-social-auth==0.2.19 tornado selenium==2.53.6 coverage +psutil |