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

20 files changed, 2 insertions, 19 deletions

diff --git a/prolog/problems/family_relations/ancestor_2/en.py b/prolog/problems/family_relations/ancestor_2/en.py
index b390705..29fb253 100644
--- a/prolog/problems/family_relations/ancestor_2/en.py
+++ b/prolog/problems/family_relations/ancestor_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 100
 name = 'ancestor/2'
 slug = 'the ancestor relation'
 
diff --git a/prolog/problems/family_relations/ancestor_2/sl.py b/prolog/problems/family_relations/ancestor_2/sl.py
index 76c2bea..d74ccc5 100644
--- a/prolog/problems/family_relations/ancestor_2/sl.py
+++ b/prolog/problems/family_relations/ancestor_2/sl.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 100
 name = 'ancestor/2'
 slug = 'X je prednik od Y'
 
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'
 
diff --git a/prolog/problems/family_relations/brother_2/en.py b/prolog/problems/family_relations/brother_2/en.py
index 709b077..2daf78f 100644
--- a/prolog/problems/family_relations/brother_2/en.py
+++ b/prolog/problems/family_relations/brother_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 97
 name = 'brother/2'
 slug = 'the brother relation'
 
diff --git a/prolog/problems/family_relations/brother_2/sl.py b/prolog/problems/family_relations/brother_2/sl.py
index f945026..96c6126 100644
--- a/prolog/problems/family_relations/brother_2/sl.py
+++ b/prolog/problems/family_relations/brother_2/sl.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 97
 name = 'brother/2'
 slug = 'X je brat od Y'
 
diff --git a/prolog/problems/family_relations/common.py b/prolog/problems/family_relations/common.py
new file mode 100644
index 0000000..5aff819
--- /dev/null
+++ b/prolog/problems/family_relations/common.py
@@ -0,0 +1,2 @@
+id = 1
+number = 1
diff --git a/prolog/problems/family_relations/connected_3/en.py b/prolog/problems/family_relations/connected_3/en.py
index 5fe8edb..f50d60e 100644
--- a/prolog/problems/family_relations/connected_3/en.py
+++ b/prolog/problems/family_relations/connected_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 102
 name = 'connected/3'
 slug = 'check if two people are connected in the family tree'
 
diff --git a/prolog/problems/family_relations/cousin_2/en.py b/prolog/problems/family_relations/cousin_2/en.py
index 1399013..cf628db 100644
--- a/prolog/problems/family_relations/cousin_2/en.py
+++ b/prolog/problems/family_relations/cousin_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 99
 name = 'cousin/2'
 slug = 'the cousin relation'
 
diff --git a/prolog/problems/family_relations/cousin_2/sl.py b/prolog/problems/family_relations/cousin_2/sl.py
index ebecf8d..7e3e7f0 100644
--- a/prolog/problems/family_relations/cousin_2/sl.py
+++ b/prolog/problems/family_relations/cousin_2/sl.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 99
 name = 'cousin/2'
 slug = 'X je bratranec ali sestrična od Y'
 
diff --git a/prolog/problems/family_relations/descendant_2/en.py b/prolog/problems/family_relations/descendant_2/en.py
index b0fccf2..74360f3 100644
--- a/prolog/problems/family_relations/descendant_2/en.py
+++ b/prolog/problems/family_relations/descendant_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 101
 name = 'descendant/2'
 slug = 'the descendant relation'
 
diff --git a/prolog/problems/family_relations/descendant_2/sl.py b/prolog/problems/family_relations/descendant_2/sl.py
index fb60e76..5e81d26 100644
--- a/prolog/problems/family_relations/descendant_2/sl.py
+++ b/prolog/problems/family_relations/descendant_2/sl.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 101
 name = 'descendant/2'
 slug = 'the descendant relation'
 
diff --git a/prolog/problems/family_relations/father_2/en.py b/prolog/problems/family_relations/father_2/en.py
index 59857a8..722c016 100644
--- a/prolog/problems/family_relations/father_2/en.py
+++ b/prolog/problems/family_relations/father_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 181
 name = 'mother/2'
 slug = 'the mother-child relation'
 
diff --git a/prolog/problems/family_relations/father_2/sl.py b/prolog/problems/family_relations/father_2/sl.py
index 67bf764..178fbc6 100644
--- a/prolog/problems/family_relations/father_2/sl.py
+++ b/prolog/problems/family_relations/father_2/sl.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 181
 name = 'father/2'
 slug = 'X je oče od Y'
 
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'
 
diff --git a/prolog/problems/family_relations/mother_2/en.py b/prolog/problems/family_relations/mother_2/en.py
index 108bb9b..722c016 100644
--- a/prolog/problems/family_relations/mother_2/en.py
+++ b/prolog/problems/family_relations/mother_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 94
 name = 'mother/2'
 slug = 'the mother-child relation'
 
diff --git a/prolog/problems/family_relations/mother_2/sl.py b/prolog/problems/family_relations/mother_2/sl.py
index 9e384c0..b37c20c 100644
--- a/prolog/problems/family_relations/mother_2/sl.py
+++ b/prolog/problems/family_relations/mother_2/sl.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 94
 name = 'mother/2'
 slug = 'X je mama od Y'
 
diff --git a/prolog/problems/family_relations/sister_2/en.py b/prolog/problems/family_relations/sister_2/en.py
index 6b055e8..32bb9d9 100644
--- a/prolog/problems/family_relations/sister_2/en.py
+++ b/prolog/problems/family_relations/sister_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 96
 name = 'sister/2'
 slug = 'the sister relation'
 
diff --git a/prolog/problems/family_relations/sister_2/sl.py b/prolog/problems/family_relations/sister_2/sl.py
index 1cb457d..d69b56c 100644
--- a/prolog/problems/family_relations/sister_2/sl.py
+++ b/prolog/problems/family_relations/sister_2/sl.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 96
 name = 'sister/2'
 slug = 'X je sestra od Y'