diff options
| author | Jure Žabkar <jure.zabkar@fri.uni-lj.si> | 2015-10-12 14:19:07 +0200 |
|---|---|---|
| committer | Jure Žabkar <jure.zabkar@fri.uni-lj.si> | 2015-10-12 14:19:07 +0200 |
| commit | 0a88716110994f789f764704a96791fdfb5fa288 (patch) | |
| tree | 788c16ab578cf76eda358abc1d0587503d413a87 /robot | |
| parent | 1a7678b37a25a76aeaef7ebb225f85406b19f928 (diff) | |
| parent | 5a01c2bb184152c6ccc3c536e9b857d247bc55ad (diff) | |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-problems
Conflicts:
robot/problems/introduction/forward/en.py
robot/problems/introduction/forward/sl.py
Diffstat (limited to 'robot')
| -rw-r--r-- | robot/common.py | 2 | ||||
| -rw-r--r-- | robot/problems/introduction/common.py | 2 | ||||
| -rw-r--r-- | robot/problems/introduction/forward/common.py | 1 | ||||
| -rw-r--r-- | robot/problems/introduction/forward/en.py | 3 | ||||
| -rw-r--r-- | robot/problems/introduction/forward/sl.py | 3 |
5 files changed, 4 insertions, 7 deletions
diff --git a/robot/common.py b/robot/common.py index 45dbfc3..1e7e818 100644 --- a/robot/common.py +++ b/robot/common.py @@ -2,6 +2,8 @@ from server.hints import Hint, HintSequence +id = 3 + hint_type = { 'no_hint': Hint('no_hint'), 'system_error': Hint('system_error'), diff --git a/robot/problems/introduction/common.py b/robot/problems/introduction/common.py new file mode 100644 index 0000000..8498d9c --- /dev/null +++ b/robot/problems/introduction/common.py @@ -0,0 +1,2 @@ +id = 13 +number = 1 diff --git a/robot/problems/introduction/forward/common.py b/robot/problems/introduction/forward/common.py index d1e1193..f6330fd 100644 --- a/robot/problems/introduction/forward/common.py +++ b/robot/problems/introduction/forward/common.py @@ -5,7 +5,6 @@ from python.util import has_token_sequence, string_almost_equal, \ from server.hints import Hint, HintSequence id = 202 -group = 'introduction' number = 1 visible = True diff --git a/robot/problems/introduction/forward/en.py b/robot/problems/introduction/forward/en.py index f8e1730..be73921 100644 --- a/robot/problems/introduction/forward/en.py +++ b/robot/problems/introduction/forward/en.py @@ -1,8 +1,5 @@ # coding=utf-8 -import server -mod = server.problems.load_language('python', 'en') -id = 202 name = 'Forward 3s' slug = 'Forward 3s' diff --git a/robot/problems/introduction/forward/sl.py b/robot/problems/introduction/forward/sl.py index 9a37b3c..837380b 100644 --- a/robot/problems/introduction/forward/sl.py +++ b/robot/problems/introduction/forward/sl.py @@ -1,8 +1,5 @@ # coding=utf-8 -import server -mod = server.problems.load_language('python', 'sl') -id = 202 name = 'Naprej 3s' slug = 'Naprej 3s' |