diff options
| author | adityacp | 2020-01-24 10:03:39 +0530 |
|---|---|---|
| committer | adityacp | 2020-01-24 10:03:39 +0530 |
| commit | 547575e98d119a00472efe3d70693ed972468031 (patch) | |
| tree | 2fc350741ebf7d78ec62eb2b41f262d53514e612 /yaksh/models.py | |
| parent | ebbb1b4d3dcec668b901200de7b31253162da80c (diff) | |
| parent | 7edfc63ab89d65337e17e8a79e8114a74b2146e3 (diff) | |
| download | online_test-547575e98d119a00472efe3d70693ed972468031.tar.gz online_test-547575e98d119a00472efe3d70693ed972468031.tar.bz2 online_test-547575e98d119a00472efe3d70693ed972468031.zip | |
Resolve conflicts in grade user, custom filters etc
Diffstat (limited to 'yaksh/models.py')
| -rw-r--r-- | yaksh/models.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/yaksh/models.py b/yaksh/models.py index 6fb9807..d1b53e7 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -46,6 +46,7 @@ languages = ( ("cpp", "C++ Language"), ("java", "Java Language"), ("scilab", "Scilab"), + ("r", "R"), ) question_types = ( |