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 /prolog/problems/family_relations/aunt_2 | |
| 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 'prolog/problems/family_relations/aunt_2')
| -rw-r--r-- | prolog/problems/family_relations/aunt_2/en.py | 1 | ||||
| -rw-r--r-- | prolog/problems/family_relations/aunt_2/sl.py | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/prolog/problems/family_relations/aunt_2/en.py b/prolog/problems/family_relations/aunt_2/en.py index 8d20d7e..25cac41 100644 --- a/prolog/problems/family_relations/aunt_2/en.py +++ b/prolog/problems/family_relations/aunt_2/en.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 98 name = 'aunt/2' slug = 'the aunt relation' diff --git a/prolog/problems/family_relations/aunt_2/sl.py b/prolog/problems/family_relations/aunt_2/sl.py index 95fc6b2..2bf0ef6 100644 --- a/prolog/problems/family_relations/aunt_2/sl.py +++ b/prolog/problems/family_relations/aunt_2/sl.py @@ -1,6 +1,5 @@ # coding=utf-8 -id = 98 name = 'aunt/2' slug = 'X je teta od Y' |