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

13 files changed, 2 insertions, 12 deletions

diff --git a/prolog/problems/sorting/common.py b/prolog/problems/sorting/common.py
new file mode 100644
index 0000000..f006f10
--- /dev/null
+++ b/prolog/problems/sorting/common.py
@@ -0,0 +1,2 @@
+id = 3
+number = 3
diff --git a/prolog/problems/sorting/is_sorted_1/common.py b/prolog/problems/sorting/is_sorted_1/common.py
index 4bb3fa9..8feb549 100644
--- a/prolog/problems/sorting/is_sorted_1/common.py
+++ b/prolog/problems/sorting/is_sorted_1/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 121
-group = 'sorting'
 number = 28
 visible = True
 facts = None
diff --git a/prolog/problems/sorting/is_sorted_1/en.py b/prolog/problems/sorting/is_sorted_1/en.py
index ab8e2dc..3ea6572 100644
--- a/prolog/problems/sorting/is_sorted_1/en.py
+++ b/prolog/problems/sorting/is_sorted_1/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 121
 name = 'is_sorted/1'
 slug = 'check if list is sorted'
 
diff --git a/prolog/problems/sorting/isort_2/common.py b/prolog/problems/sorting/isort_2/common.py
index 94f5f42..f2c4244 100644
--- a/prolog/problems/sorting/isort_2/common.py
+++ b/prolog/problems/sorting/isort_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 123
-group = 'sorting'
 number = 30
 visible = True
 facts = None
diff --git a/prolog/problems/sorting/isort_2/en.py b/prolog/problems/sorting/isort_2/en.py
index d9b3796..9fba6ac 100644
--- a/prolog/problems/sorting/isort_2/en.py
+++ b/prolog/problems/sorting/isort_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 123
 name = 'isort/2'
 slug = 'sort a list using insertion sort'
 
diff --git a/prolog/problems/sorting/pivoting_4/common.py b/prolog/problems/sorting/pivoting_4/common.py
index a8ff2f4..dd1a1a9 100644
--- a/prolog/problems/sorting/pivoting_4/common.py
+++ b/prolog/problems/sorting/pivoting_4/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 124
-group = 'sorting'
 number = 31
 visible = True
 facts = None
diff --git a/prolog/problems/sorting/pivoting_4/en.py b/prolog/problems/sorting/pivoting_4/en.py
index 5a5e171..43e4ae3 100644
--- a/prolog/problems/sorting/pivoting_4/en.py
+++ b/prolog/problems/sorting/pivoting_4/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 124
 name = 'pivoting/4'
 slug = 'split a list according to the pivot'
 
diff --git a/prolog/problems/sorting/quick_sort_2/common.py b/prolog/problems/sorting/quick_sort_2/common.py
index 9c2b261..4afc8fa 100644
--- a/prolog/problems/sorting/quick_sort_2/common.py
+++ b/prolog/problems/sorting/quick_sort_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 125
-group = 'sorting'
 number = 32
 visible = True
 facts = None
diff --git a/prolog/problems/sorting/quick_sort_2/en.py b/prolog/problems/sorting/quick_sort_2/en.py
index bed1a83..faf6d41 100644
--- a/prolog/problems/sorting/quick_sort_2/en.py
+++ b/prolog/problems/sorting/quick_sort_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 125
 name = 'quick_sort/2'
 slug = 'sort a list using quicksort'
 
diff --git a/prolog/problems/sorting/sins_3/common.py b/prolog/problems/sorting/sins_3/common.py
index ba50e65..ab592ea 100644
--- a/prolog/problems/sorting/sins_3/common.py
+++ b/prolog/problems/sorting/sins_3/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 122
-group = 'sorting'
 number = 29
 visible = True
 facts = None
diff --git a/prolog/problems/sorting/sins_3/en.py b/prolog/problems/sorting/sins_3/en.py
index 384fbf7..2d9cf98 100644
--- a/prolog/problems/sorting/sins_3/en.py
+++ b/prolog/problems/sorting/sins_3/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 122
 name = 'sins/3'
 slug = 'insert an element at correct position into a sorted list'
 
diff --git a/prolog/problems/sorting/slowest_sort_ever_2/common.py b/prolog/problems/sorting/slowest_sort_ever_2/common.py
index 267f06a..fc8f980 100644
--- a/prolog/problems/sorting/slowest_sort_ever_2/common.py
+++ b/prolog/problems/sorting/slowest_sort_ever_2/common.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 id = 126
-group = 'sorting'
 number = 33
 visible = True
 facts = None
diff --git a/prolog/problems/sorting/slowest_sort_ever_2/en.py b/prolog/problems/sorting/slowest_sort_ever_2/en.py
index 0f39645..e327102 100644
--- a/prolog/problems/sorting/slowest_sort_ever_2/en.py
+++ b/prolog/problems/sorting/slowest_sort_ever_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 126
 name = 'slowest_sort_ever/2'
 slug = 'sort a list by randomly permuting elements'