summaryrefslogtreecommitdiff
path: root/python/problems/introduction
diff options
context:
space:
mode:
authorMartin <martin@leo.fri1.uni-lj.si>2015-10-09 11:19:53 +0200
committerMartin <martin@leo.fri1.uni-lj.si>2015-10-09 11:19:53 +0200
commitfd31d7d74e58796f3a5a7c84b4b19cb4af59ef4c (patch)
treea1bbe33960a7cb59d9f370c9127e02a96f3d2005 /python/problems/introduction
parent84f3426c937d1bb9d44ba25a71706416fbb8b85d (diff)
parent7e918d834296e206aef922ee02d6991722c4653e (diff)
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
Diffstat (limited to 'python/problems/introduction')
-rw-r--r--python/problems/introduction/average/en.py1
-rw-r--r--python/problems/introduction/average/sl.py1
-rw-r--r--python/problems/introduction/ballistics/en.py1
-rw-r--r--python/problems/introduction/ballistics/sl.py1
-rw-r--r--python/problems/introduction/common.py2
-rw-r--r--python/problems/introduction/fahrenheit_to_celsius/en.py1
-rw-r--r--python/problems/introduction/fahrenheit_to_celsius/sl.py1
-rw-r--r--python/problems/introduction/fast_fingers/en.py1
-rw-r--r--python/problems/introduction/fast_fingers/sl.py1
-rw-r--r--python/problems/introduction/fast_fingers_2/en.py1
-rw-r--r--python/problems/introduction/fast_fingers_2/sl.py1
-rw-r--r--python/problems/introduction/pythagorean_theorem/en.py1
-rw-r--r--python/problems/introduction/pythagorean_theorem/sl.py1
13 files changed, 2 insertions, 12 deletions
diff --git a/python/problems/introduction/average/en.py b/python/problems/introduction/average/en.py
index 7742a7d..5ce621e 100644
--- a/python/problems/introduction/average/en.py
+++ b/python/problems/introduction/average/en.py
@@ -1,6 +1,5 @@
# coding=utf-8
-id = 1000
name = 'Average grade'
slug = 'Average grade'
diff --git a/python/problems/introduction/average/sl.py b/python/problems/introduction/average/sl.py
index d7eafbb..540a9cc 100644
--- a/python/problems/introduction/average/sl.py
+++ b/python/problems/introduction/average/sl.py
@@ -2,7 +2,6 @@
import server
mod = server.problems.load_language('python', 'sl')
-id = 189
name = 'Povprečna ocena'
slug = 'Povprečna ocena'
diff --git a/python/problems/introduction/ballistics/en.py b/python/problems/introduction/ballistics/en.py
index 34dca8a..6fab80f 100644
--- a/python/problems/introduction/ballistics/en.py
+++ b/python/problems/introduction/ballistics/en.py
@@ -1,6 +1,5 @@
# coding=utf-8
-id = 1000
name = 'Ballistics'
slug = 'Ballistics'
diff --git a/python/problems/introduction/ballistics/sl.py b/python/problems/introduction/ballistics/sl.py
index fa0fe5d..ee073f8 100644
--- a/python/problems/introduction/ballistics/sl.py
+++ b/python/problems/introduction/ballistics/sl.py
@@ -2,7 +2,6 @@
import server
mod = server.problems.load_language('python', 'sl')
-id = 187
name = 'Topologija'
slug = 'Topologija'
diff --git a/python/problems/introduction/common.py b/python/problems/introduction/common.py
new file mode 100644
index 0000000..8498d9c
--- /dev/null
+++ b/python/problems/introduction/common.py
@@ -0,0 +1,2 @@
+id = 13
+number = 1
diff --git a/python/problems/introduction/fahrenheit_to_celsius/en.py b/python/problems/introduction/fahrenheit_to_celsius/en.py
index a2af212..5d7522e 100644
--- a/python/problems/introduction/fahrenheit_to_celsius/en.py
+++ b/python/problems/introduction/fahrenheit_to_celsius/en.py
@@ -1,6 +1,5 @@
# coding=utf-8
-id = 180
name = 'Converting Fahrenheit to Celsius'
slug = 'Converting Fahrenheit to Celsius'
diff --git a/python/problems/introduction/fahrenheit_to_celsius/sl.py b/python/problems/introduction/fahrenheit_to_celsius/sl.py
index ae3db5f..f5ce4a4 100644
--- a/python/problems/introduction/fahrenheit_to_celsius/sl.py
+++ b/python/problems/introduction/fahrenheit_to_celsius/sl.py
@@ -2,7 +2,6 @@
import server
mod = server.problems.load_language('python', 'sl')
-id = 180
name = 'Pretvarjanje iz Fahrenheitov v Celzije'
slug = 'Pretvarjanje iz Fahrenheitov v Celzije'
diff --git a/python/problems/introduction/fast_fingers/en.py b/python/problems/introduction/fast_fingers/en.py
index de07494..ab4637a 100644
--- a/python/problems/introduction/fast_fingers/en.py
+++ b/python/problems/introduction/fast_fingers/en.py
@@ -1,6 +1,5 @@
# coding=utf-8
-id = 1000
name = 'Fast fingers'
slug = 'Fast fingers'
diff --git a/python/problems/introduction/fast_fingers/sl.py b/python/problems/introduction/fast_fingers/sl.py
index 0b38a3a..c181951 100644
--- a/python/problems/introduction/fast_fingers/sl.py
+++ b/python/problems/introduction/fast_fingers/sl.py
@@ -2,7 +2,6 @@
import server
mod = server.problems.load_language('python', 'sl')
-id = 190
name = 'Hitri prsti'
slug = 'Hitri prsti'
diff --git a/python/problems/introduction/fast_fingers_2/en.py b/python/problems/introduction/fast_fingers_2/en.py
index 636f4d0..2172127 100644
--- a/python/problems/introduction/fast_fingers_2/en.py
+++ b/python/problems/introduction/fast_fingers_2/en.py
@@ -1,6 +1,5 @@
# coding=utf-8
-id = 1000
name = 'Fast fingers 2'
slug = 'Fast fingers 2'
diff --git a/python/problems/introduction/fast_fingers_2/sl.py b/python/problems/introduction/fast_fingers_2/sl.py
index 125bd24..6606fbe 100644
--- a/python/problems/introduction/fast_fingers_2/sl.py
+++ b/python/problems/introduction/fast_fingers_2/sl.py
@@ -2,7 +2,6 @@
import server
mod = server.problems.load_language('python', 'sl')
-id = 191
name = 'Hitri prsti 2'
slug = 'Hitri prsti 2'
diff --git a/python/problems/introduction/pythagorean_theorem/en.py b/python/problems/introduction/pythagorean_theorem/en.py
index b3c6117..79d7e39 100644
--- a/python/problems/introduction/pythagorean_theorem/en.py
+++ b/python/problems/introduction/pythagorean_theorem/en.py
@@ -1,6 +1,5 @@
# coding=utf-8
-id = 1000
name = 'Pythagorean theorem'
slug = 'Pythagorean theorem'
diff --git a/python/problems/introduction/pythagorean_theorem/sl.py b/python/problems/introduction/pythagorean_theorem/sl.py
index 21aec9a..9500651 100644
--- a/python/problems/introduction/pythagorean_theorem/sl.py
+++ b/python/problems/introduction/pythagorean_theorem/sl.py
@@ -2,7 +2,6 @@
import server
mod = server.problems.load_language('python', 'sl')
-id = 188
name = 'Pitagorov izrek'
slug = 'Pitagorov izrek'