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

8 files changed, 2 insertions, 7 deletions

diff --git a/prolog/problems/clp_fd/common.py b/prolog/problems/clp_fd/common.py
new file mode 100644
index 0000000..3b1f9cf
--- /dev/null
+++ b/prolog/problems/clp_fd/common.py
@@ -0,0 +1,2 @@
+id = 8
+number = 7
diff --git a/prolog/problems/clp_fd/gcd_3/en.py b/prolog/problems/clp_fd/gcd_3/en.py
index d6c92b7..7953eb1 100644
--- a/prolog/problems/clp_fd/gcd_3/en.py
+++ b/prolog/problems/clp_fd/gcd_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 149
 name = 'gcd/3'
 slug = 'greatest common divisor'
 
diff --git a/prolog/problems/clp_fd/magic_1/en.py b/prolog/problems/clp_fd/magic_1/en.py
index 04c1481..c8b5a1a 100644
--- a/prolog/problems/clp_fd/magic_1/en.py
+++ b/prolog/problems/clp_fd/magic_1/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 151
 name = 'magic/1'
 slug = 'generate a 3x3 magic square'
 
diff --git a/prolog/problems/clp_fd/puzzle_abc_3/en.py b/prolog/problems/clp_fd/puzzle_abc_3/en.py
index 3d70715..899b428 100644
--- a/prolog/problems/clp_fd/puzzle_abc_3/en.py
+++ b/prolog/problems/clp_fd/puzzle_abc_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 153
 name = 'puzzle_abc/3'
 slug = 'age puzzle: abc'
 
diff --git a/prolog/problems/clp_fd/puzzle_beth_1/en.py b/prolog/problems/clp_fd/puzzle_beth_1/en.py
index fed373c..3dea18c 100644
--- a/prolog/problems/clp_fd/puzzle_beth_1/en.py
+++ b/prolog/problems/clp_fd/puzzle_beth_1/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 155
 name = 'puzzle_beth/1'
 slug = 'age puzzle: beth'
 
diff --git a/prolog/problems/clp_fd/puzzle_momson_2/en.py b/prolog/problems/clp_fd/puzzle_momson_2/en.py
index cf97abf..b9b26cb 100644
--- a/prolog/problems/clp_fd/puzzle_momson_2/en.py
+++ b/prolog/problems/clp_fd/puzzle_momson_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 152
 name = 'puzzle_momson/2'
 slug = 'age puzzle: mom & son'
 
diff --git a/prolog/problems/clp_fd/puzzle_ratio_2/en.py b/prolog/problems/clp_fd/puzzle_ratio_2/en.py
index 28fc999..2cb3039 100644
--- a/prolog/problems/clp_fd/puzzle_ratio_2/en.py
+++ b/prolog/problems/clp_fd/puzzle_ratio_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 154
 name = 'puzzle_ratio/2'
 slug = 'age puzzle: ratio'
 
diff --git a/prolog/problems/clp_fd/tobase_3/en.py b/prolog/problems/clp_fd/tobase_3/en.py
index a778ccb..c05ab2a 100644
--- a/prolog/problems/clp_fd/tobase_3/en.py
+++ b/prolog/problems/clp_fd/tobase_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 150
 name = 'tobase/3'
 slug = 'convert numbers from/to the decimal system'