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 /prolog/problems/family_relations/grandparent_2 | |
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 'prolog/problems/family_relations/grandparent_2')
-rw-r--r-- | prolog/problems/family_relations/grandparent_2/common.py | 1 | ||||
-rw-r--r-- | prolog/problems/family_relations/grandparent_2/en.py | 1 | ||||
-rw-r--r-- | prolog/problems/family_relations/grandparent_2/sl.py | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/prolog/problems/family_relations/grandparent_2/common.py b/prolog/problems/family_relations/grandparent_2/common.py index fec7734..ee7b25b 100644 --- a/prolog/problems/family_relations/grandparent_2/common.py +++ b/prolog/problems/family_relations/grandparent_2/common.py @@ -8,7 +8,6 @@ from server.hints import Hint, HintSequence, HintPopup import server.problems id = 95 -group = 'family_relations' number = 30 visible = True facts = 'family_relations' diff --git a/prolog/problems/family_relations/grandparent_2/en.py b/prolog/problems/family_relations/grandparent_2/en.py index 6fdeb70..c181ab5 100644 --- a/prolog/problems/family_relations/grandparent_2/en.py +++ b/prolog/problems/family_relations/grandparent_2/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 95 name = 'grandparent/2' slug = 'the grandparent relation' diff --git a/prolog/problems/family_relations/grandparent_2/sl.py b/prolog/problems/family_relations/grandparent_2/sl.py index 35ff49e..a4440a6 100644 --- a/prolog/problems/family_relations/grandparent_2/sl.py +++ b/prolog/problems/family_relations/grandparent_2/sl.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 95 name = 'grandparent/2' slug = 'X je dedek ali babica od Y' |