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

15 files changed, 2 insertions, 14 deletions

diff --git a/prolog/problems/denotational_semantics/algol_3/common.py b/prolog/problems/denotational_semantics/algol_3/common.py
index 1f5b196..cce9b69 100644
--- a/prolog/problems/denotational_semantics/algol_3/common.py
+++ b/prolog/problems/denotational_semantics/algol_3/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 176
-group = 'denotational_semantics'
 number = 83
 visible = True
 facts = None
diff --git a/prolog/problems/denotational_semantics/algol_3/en.py b/prolog/problems/denotational_semantics/algol_3/en.py
index 5c79c41..c5da13e 100644
--- a/prolog/problems/denotational_semantics/algol_3/en.py
+++ b/prolog/problems/denotational_semantics/algol_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 176
 name = 'algol/3'
 slug = 'interpreter for mini-algol'
 
diff --git a/prolog/problems/denotational_semantics/algol_for_3/common.py b/prolog/problems/denotational_semantics/algol_for_3/common.py
index bc0c3e8..4cf9373 100644
--- a/prolog/problems/denotational_semantics/algol_for_3/common.py
+++ b/prolog/problems/denotational_semantics/algol_for_3/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 178
-group = 'denotational_semantics'
 number = 85
 visible = True
 facts = None
diff --git a/prolog/problems/denotational_semantics/algol_for_3/en.py b/prolog/problems/denotational_semantics/algol_for_3/en.py
index 53e5e2b..d4b8144 100644
--- a/prolog/problems/denotational_semantics/algol_for_3/en.py
+++ b/prolog/problems/denotational_semantics/algol_for_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 178
 name = 'algol_for/3'
 slug = 'interpreter for mini-algol with for-statement'
 
diff --git a/prolog/problems/denotational_semantics/algol_if_3/common.py b/prolog/problems/denotational_semantics/algol_if_3/common.py
index fd750e0..0c52886 100644
--- a/prolog/problems/denotational_semantics/algol_if_3/common.py
+++ b/prolog/problems/denotational_semantics/algol_if_3/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 177
-group = 'denotational_semantics'
 number = 84
 visible = True
 facts = None
diff --git a/prolog/problems/denotational_semantics/algol_if_3/en.py b/prolog/problems/denotational_semantics/algol_if_3/en.py
index f4ae00a..fae6c45 100644
--- a/prolog/problems/denotational_semantics/algol_if_3/en.py
+++ b/prolog/problems/denotational_semantics/algol_if_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 177
 name = 'algol_if/3'
 slug = 'interpreter for mini-algol with if-statement'
 
diff --git a/prolog/problems/denotational_semantics/common.py b/prolog/problems/denotational_semantics/common.py
new file mode 100644
index 0000000..e2c420e
--- /dev/null
+++ b/prolog/problems/denotational_semantics/common.py
@@ -0,0 +1,2 @@
+id = 11
+number = 10
diff --git a/prolog/problems/denotational_semantics/prog_8puzzle_2/common.py b/prolog/problems/denotational_semantics/prog_8puzzle_2/common.py
index e48d03f..d994039 100644
--- a/prolog/problems/denotational_semantics/prog_8puzzle_2/common.py
+++ b/prolog/problems/denotational_semantics/prog_8puzzle_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 172
-group = 'denotational_semantics'
 number = 81
 visible = True
 facts = None
diff --git a/prolog/problems/denotational_semantics/prog_8puzzle_2/en.py b/prolog/problems/denotational_semantics/prog_8puzzle_2/en.py
index d43a837..fc49742 100644
--- a/prolog/problems/denotational_semantics/prog_8puzzle_2/en.py
+++ b/prolog/problems/denotational_semantics/prog_8puzzle_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 172
 name = 'prog_8puzzle/2'
 slug = '8-puzzle-solving language'
 
diff --git a/prolog/problems/denotational_semantics/prog_8puzzle_3/common.py b/prolog/problems/denotational_semantics/prog_8puzzle_3/common.py
index f86a0c4..15dce6b 100644
--- a/prolog/problems/denotational_semantics/prog_8puzzle_3/common.py
+++ b/prolog/problems/denotational_semantics/prog_8puzzle_3/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 173
-group = 'denotational_semantics'
 number = 82
 visible = True
 facts = 'denotational_semantics_aux__predicates'
diff --git a/prolog/problems/denotational_semantics/prog_8puzzle_3/en.py b/prolog/problems/denotational_semantics/prog_8puzzle_3/en.py
index 346d579..1c23b18 100644
--- a/prolog/problems/denotational_semantics/prog_8puzzle_3/en.py
+++ b/prolog/problems/denotational_semantics/prog_8puzzle_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 173
 name = 'prog_8puzzle/3'
 slug = '8-puzzle-solving language with semantics'
 
diff --git a/prolog/problems/denotational_semantics/prog_listswap_2/common.py b/prolog/problems/denotational_semantics/prog_listswap_2/common.py
index 9a7c586..1f8b655 100644
--- a/prolog/problems/denotational_semantics/prog_listswap_2/common.py
+++ b/prolog/problems/denotational_semantics/prog_listswap_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 175
-group = 'denotational_semantics'
 number = 79
 visible = True
 facts = None
diff --git a/prolog/problems/denotational_semantics/prog_listswap_2/en.py b/prolog/problems/denotational_semantics/prog_listswap_2/en.py
index 2cf8fff..0f8e038 100644
--- a/prolog/problems/denotational_semantics/prog_listswap_2/en.py
+++ b/prolog/problems/denotational_semantics/prog_listswap_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 175
 name = 'prog_listswap/2'
 slug = 'list-manipulation language'
 
diff --git a/prolog/problems/denotational_semantics/prog_listswap_3/common.py b/prolog/problems/denotational_semantics/prog_listswap_3/common.py
index 2b32618..a40be29 100644
--- a/prolog/problems/denotational_semantics/prog_listswap_3/common.py
+++ b/prolog/problems/denotational_semantics/prog_listswap_3/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 174
-group = 'denotational_semantics'
 number = 80
 visible = True
 facts = 'denotational_semantics_aux__predicates'
diff --git a/prolog/problems/denotational_semantics/prog_listswap_3/en.py b/prolog/problems/denotational_semantics/prog_listswap_3/en.py
index 88a927a..5e85ce6 100644
--- a/prolog/problems/denotational_semantics/prog_listswap_3/en.py
+++ b/prolog/problems/denotational_semantics/prog_listswap_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 174
 name = 'prog_listswap/3'
 slug = 'list-manipulation language with semantics'