From 1e5d42ba53ea0c631dbc6f21887839c91571ebca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jure=20=C5=BDabkar?= <jure.zabkar@fri.uni-lj.si>
Date: Tue, 13 Oct 2015 12:24:41 +0200
Subject: Uvodne vaje za robotiko

---
 robot/problems/introduction/forward/en.py~ | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 robot/problems/introduction/forward/en.py~

(limited to 'robot/problems/introduction/forward/en.py~')

diff --git a/robot/problems/introduction/forward/en.py~ b/robot/problems/introduction/forward/en.py~
new file mode 100644
index 0000000..4337ac5
--- /dev/null
+++ b/robot/problems/introduction/forward/en.py~
@@ -0,0 +1,20 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'en')
+
+<<<<<<< HEAD
+id = 202
+name = 'Forward 3s'
+slug = 'Forward 3s'
+=======
+name = 'Forward'
+slug = 'Forward'
+>>>>>>> 5a01c2bb184152c6ccc3c536e9b857d247bc55ad
+
+description = '''\
+<p>Write a program that would make the robot drive straight forward for 3 seconds and stop</p>
+'''
+
+hint = {
+    
+}
-- 
cgit v1.2.1