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, 1 insertions, 10 deletions

diff --git a/python/problems/while_and_if/buy_five/en.py b/python/problems/while_and_if/buy_five/en.py
index 7e522da..9ad1f06 100644
--- a/python/problems/while_and_if/buy_five/en.py
+++ b/python/problems/while_and_if/buy_five/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 185
 name = 'Buy five'
 slug = 'Buy five'
 
diff --git a/python/problems/while_and_if/buy_five/sl.py b/python/problems/while_and_if/buy_five/sl.py
index 8008d91..3dbc9d3 100644
--- a/python/problems/while_and_if/buy_five/sl.py
+++ b/python/problems/while_and_if/buy_five/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 185
 name = 'Blagajna "vse po pet"'
 slug = 'Blagajna "vse po pet"'
 
diff --git a/python/problems/while_and_if/checking_account/sl.py b/python/problems/while_and_if/checking_account/sl.py
index 91a877c..86f973b 100644
--- a/python/problems/while_and_if/checking_account/sl.py
+++ b/python/problems/while_and_if/checking_account/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 200
 name = 'Tekoči račun'
 slug = 'Tekoči račun'
 
diff --git a/python/problems/while_and_if/common.py b/python/problems/while_and_if/common.py
new file mode 100644
index 0000000..3ca8844
--- /dev/null
+++ b/python/problems/while_and_if/common.py
@@ -0,0 +1 @@
+id = 14
diff --git a/python/problems/while_and_if/competition/en.py b/python/problems/while_and_if/competition/en.py
index f6399a2..215665c 100644
--- a/python/problems/while_and_if/competition/en.py
+++ b/python/problems/while_and_if/competition/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 185
 name = 'Competition'
 slug = 'Competition'
 
diff --git a/python/problems/while_and_if/competition/sl.py b/python/problems/while_and_if/competition/sl.py
index 2fedf14..195b51f 100644
--- a/python/problems/while_and_if/competition/sl.py
+++ b/python/problems/while_and_if/competition/sl.py
@@ -3,7 +3,6 @@ import server
 mod = server.problems.load_language('python', 'sl')
 
 
-id = 192
 name = 'Blagajna "konkurenca"'
 slug = 'Blagajna "konkurenca"'
 
diff --git a/python/problems/while_and_if/consumers_anonymous/sl.py b/python/problems/while_and_if/consumers_anonymous/sl.py
index cc5bcb7..131a13b 100644
--- a/python/problems/while_and_if/consumers_anonymous/sl.py
+++ b/python/problems/while_and_if/consumers_anonymous/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 201
 name = 'Klub anonimnih potrošnikov'
 slug = 'Klub anonimnih potrošnikov'
 
diff --git a/python/problems/while_and_if/minimax/en.py b/python/problems/while_and_if/minimax/en.py
index 10689ec..2aee417 100644
--- a/python/problems/while_and_if/minimax/en.py
+++ b/python/problems/while_and_if/minimax/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 200
 name = 'Minimax'
 slug = 'Minimax'
 
diff --git a/python/problems/while_and_if/minimax/sl.py b/python/problems/while_and_if/minimax/sl.py
index 2b07efa..0d934b8 100644
--- a/python/problems/while_and_if/minimax/sl.py
+++ b/python/problems/while_and_if/minimax/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 199
 name = 'Blagajna "minimax"'
 slug = 'Blagajna "minimax"'
 
diff --git a/python/problems/while_and_if/top_shop/en.py b/python/problems/while_and_if/top_shop/en.py
index a69ae9a..b8e5119 100644
--- a/python/problems/while_and_if/top_shop/en.py
+++ b/python/problems/while_and_if/top_shop/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 198
 name = 'Top shop'
 slug = 'Top shop'
 
diff --git a/python/problems/while_and_if/top_shop/sl.py b/python/problems/while_and_if/top_shop/sl.py
index b577633..334736c 100644
--- a/python/problems/while_and_if/top_shop/sl.py
+++ b/python/problems/while_and_if/top_shop/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 198
 name = 'Blagajna "top shop"'
 slug = 'Blagajna "top shop"'