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

21 files changed, 2 insertions, 20 deletions

diff --git a/prolog/problems/dcg/ab_2/common.py b/prolog/problems/dcg/ab_2/common.py
index f473a0b..b9109fc 100644
--- a/prolog/problems/dcg/ab_2/common.py
+++ b/prolog/problems/dcg/ab_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 162
-group = 'dcg'
 number = 69
 visible = True
 facts = None
diff --git a/prolog/problems/dcg/ab_2/en.py b/prolog/problems/dcg/ab_2/en.py
index 20c8317..4dd81a5 100644
--- a/prolog/problems/dcg/ab_2/en.py
+++ b/prolog/problems/dcg/ab_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 162
 name = 'ab/2'
 slug = 'a*b*'
 
diff --git a/prolog/problems/dcg/common.py b/prolog/problems/dcg/common.py
new file mode 100644
index 0000000..4992f2d
--- /dev/null
+++ b/prolog/problems/dcg/common.py
@@ -0,0 +1,2 @@
+id = 10
+number = 9
diff --git a/prolog/problems/dcg/digit_2/common.py b/prolog/problems/dcg/digit_2/common.py
index 5b31e04..571df40 100644
--- a/prolog/problems/dcg/digit_2/common.py
+++ b/prolog/problems/dcg/digit_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 164
-group = 'dcg'
 number = 71
 visible = True
 facts = None
diff --git a/prolog/problems/dcg/digit_2/en.py b/prolog/problems/dcg/digit_2/en.py
index 3172a21..80b7be0 100644
--- a/prolog/problems/dcg/digit_2/en.py
+++ b/prolog/problems/dcg/digit_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 164
 name = 'digit/2'
 slug = 'a decimal digit'
 
diff --git a/prolog/problems/dcg/expr_2/common.py b/prolog/problems/dcg/expr_2/common.py
index f5c4aa0..2420ebe 100644
--- a/prolog/problems/dcg/expr_2/common.py
+++ b/prolog/problems/dcg/expr_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 170
-group = 'dcg'
 number = 77
 visible = False
 facts = None
diff --git a/prolog/problems/dcg/expr_2/en.py b/prolog/problems/dcg/expr_2/en.py
index d4b0dc9..88f1731 100644
--- a/prolog/problems/dcg/expr_2/en.py
+++ b/prolog/problems/dcg/expr_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 170
 name = 'expr/2'
 slug = 'arithmetic expressions'
 
diff --git a/prolog/problems/dcg/expr_3/common.py b/prolog/problems/dcg/expr_3/common.py
index 651a1b9..10220a8 100644
--- a/prolog/problems/dcg/expr_3/common.py
+++ b/prolog/problems/dcg/expr_3/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 171
-group = 'dcg'
 number = 78
 visible = False
 facts = None
diff --git a/prolog/problems/dcg/expr_3/en.py b/prolog/problems/dcg/expr_3/en.py
index 659503d..298ebeb 100644
--- a/prolog/problems/dcg/expr_3/en.py
+++ b/prolog/problems/dcg/expr_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 171
 name = 'expr/3'
 slug = 'arithmetic expressions with meaning'
 
diff --git a/prolog/problems/dcg/flower_2/common.py b/prolog/problems/dcg/flower_2/common.py
index 5865da9..e28d10d 100644
--- a/prolog/problems/dcg/flower_2/common.py
+++ b/prolog/problems/dcg/flower_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 163
-group = 'dcg'
 number = 70
 visible = True
 facts = None
diff --git a/prolog/problems/dcg/flower_2/en.py b/prolog/problems/dcg/flower_2/en.py
index 0267278..e7272c5 100644
--- a/prolog/problems/dcg/flower_2/en.py
+++ b/prolog/problems/dcg/flower_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 163
 name = 'flower/2'
 slug = 'words like +++--+++'
 
diff --git a/prolog/problems/dcg/number_2/common.py b/prolog/problems/dcg/number_2/common.py
index 6d33e12..a05ca18 100644
--- a/prolog/problems/dcg/number_2/common.py
+++ b/prolog/problems/dcg/number_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 165
-group = 'dcg'
 number = 72
 visible = True
 facts = None
diff --git a/prolog/problems/dcg/number_2/en.py b/prolog/problems/dcg/number_2/en.py
index 8e88655..29a4366 100644
--- a/prolog/problems/dcg/number_2/en.py
+++ b/prolog/problems/dcg/number_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 165
 name = 'number/2'
 slug = 'numbers with potential leading zeros'
 
diff --git a/prolog/problems/dcg/number_3/common.py b/prolog/problems/dcg/number_3/common.py
index 0e6f2b0..2977392 100644
--- a/prolog/problems/dcg/number_3/common.py
+++ b/prolog/problems/dcg/number_3/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 167
-group = 'dcg'
 number = 74
 visible = True
 facts = None
diff --git a/prolog/problems/dcg/number_3/en.py b/prolog/problems/dcg/number_3/en.py
index b73e16d..c2f9c3d 100644
--- a/prolog/problems/dcg/number_3/en.py
+++ b/prolog/problems/dcg/number_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 167
 name = 'number/3'
 slug = 'numbers with meaning'
 
diff --git a/prolog/problems/dcg/number_proper_2/common.py b/prolog/problems/dcg/number_proper_2/common.py
index c6b535b..a3e3592 100644
--- a/prolog/problems/dcg/number_proper_2/common.py
+++ b/prolog/problems/dcg/number_proper_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 166
-group = 'dcg'
 number = 73
 visible = True
 facts = None
diff --git a/prolog/problems/dcg/number_proper_2/en.py b/prolog/problems/dcg/number_proper_2/en.py
index 81ca5f6..8580ab7 100644
--- a/prolog/problems/dcg/number_proper_2/en.py
+++ b/prolog/problems/dcg/number_proper_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 166
 name = 'number_proper/2'
 slug = 'numbers without leading zeros'
 
diff --git a/prolog/problems/dcg/paren_2/common.py b/prolog/problems/dcg/paren_2/common.py
index d5969a2..1d8f653 100644
--- a/prolog/problems/dcg/paren_2/common.py
+++ b/prolog/problems/dcg/paren_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 168
-group = 'dcg'
 number = 75
 visible = True
 facts = None
diff --git a/prolog/problems/dcg/paren_2/en.py b/prolog/problems/dcg/paren_2/en.py
index 268b774..3041a67 100644
--- a/prolog/problems/dcg/paren_2/en.py
+++ b/prolog/problems/dcg/paren_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 168
 name = 'paren/2'
 slug = 'properly nested parens'
 
diff --git a/prolog/problems/dcg/paren_3/common.py b/prolog/problems/dcg/paren_3/common.py
index 4cda182..a905149 100644
--- a/prolog/problems/dcg/paren_3/common.py
+++ b/prolog/problems/dcg/paren_3/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 169
-group = 'dcg'
 number = 76
 visible = True
 facts = None
diff --git a/prolog/problems/dcg/paren_3/en.py b/prolog/problems/dcg/paren_3/en.py
index 737f0ef..56519ff 100644
--- a/prolog/problems/dcg/paren_3/en.py
+++ b/prolog/problems/dcg/paren_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 169
 name = 'paren/3'
 slug = 'properly nested parens with meaning'