diff options
author | Martin Možina <martin.mozina@fri.uni-lj.si> | 2015-10-26 17:52:33 +0100 |
---|---|---|
committer | Martin Možina <martin.mozina@fri.uni-lj.si> | 2015-10-26 17:52:33 +0100 |
commit | ec7740df5a94d90758d688ac0f753e12de931360 (patch) | |
tree | bed8670411a652811c73f031611789172a6aa030 /prolog/problems/family_relations | |
parent | ed5473c15bdb472219056b30850605cf7e3b9a18 (diff) | |
parent | a1c8d26d58f24fa243864b2d386b21ec727b2c40 (diff) |
Merge branch 'master' of 192.168.15.97:codeq-problems
Conflicts:
python/problems/introduction/fahrenheit_to_celsius/sl.py
Diffstat (limited to 'prolog/problems/family_relations')
-rw-r--r-- | prolog/problems/family_relations/en.py | 4 | ||||
-rw-r--r-- | prolog/problems/family_relations/sl.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/prolog/problems/family_relations/en.py b/prolog/problems/family_relations/en.py index 18bc313..dd8f6d6 100644 --- a/prolog/problems/family_relations/en.py +++ b/prolog/problems/family_relations/en.py @@ -1,2 +1,2 @@ -name = 'Denotational semantics' -description = '' +name = 'Family relations' +description = 'First steps in Prolog, defining rules for various family relations.' diff --git a/prolog/problems/family_relations/sl.py b/prolog/problems/family_relations/sl.py index f717912..fafdeef 100644 --- a/prolog/problems/family_relations/sl.py +++ b/prolog/problems/family_relations/sl.py @@ -1,2 +1,2 @@ name = 'Družinske relacije' -description = '' +description = 'Prvi koraki v prologu, pisanje pravil za različne družinske relacije.' |