diff options
| author | Martin <martin@leo.fri1.uni-lj.si> | 2015-10-09 11:19:53 +0200 |
|---|---|---|
| committer | Martin <martin@leo.fri1.uni-lj.si> | 2015-10-09 11:19:53 +0200 |
| commit | fd31d7d74e58796f3a5a7c84b4b19cb4af59ef4c (patch) | |
| tree | a1bbe33960a7cb59d9f370c9127e02a96f3d2005 /python/problems/while_and_if/top_shop | |
| parent | 84f3426c937d1bb9d44ba25a71706416fbb8b85d (diff) | |
| parent | 7e918d834296e206aef922ee02d6991722c4653e (diff) | |
Merge branch 'master' of 192.168.15.97:codeq-problems
Conflicts:
python/problems/while_and_if/checking_account/en.py
python/problems/while_and_if/consumers_anonymous/en.py
Diffstat (limited to 'python/problems/while_and_if/top_shop')
| -rw-r--r-- | python/problems/while_and_if/top_shop/en.py | 1 | ||||
| -rw-r--r-- | python/problems/while_and_if/top_shop/sl.py | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/python/problems/while_and_if/top_shop/en.py b/python/problems/while_and_if/top_shop/en.py index a69ae9a..b8e5119 100644 --- a/python/problems/while_and_if/top_shop/en.py +++ b/python/problems/while_and_if/top_shop/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 198 name = 'Top shop' slug = 'Top shop' diff --git a/python/problems/while_and_if/top_shop/sl.py b/python/problems/while_and_if/top_shop/sl.py index b577633..334736c 100644 --- a/python/problems/while_and_if/top_shop/sl.py +++ b/python/problems/while_and_if/top_shop/sl.py @@ -2,7 +2,6 @@ import server mod = server.problems.load_language('python', 'sl') -id = 198 name = 'Blagajna "top shop"' slug = 'Blagajna "top shop"' |