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

11 files changed, 2 insertions, 10 deletions

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/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/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/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/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/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/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/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/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/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'