diff options
author | Timotej Lazar <timotej.lazar@fri.uni-lj.si> | 2015-10-13 13:00:05 +0200 |
---|---|---|
committer | Timotej Lazar <timotej.lazar@fri.uni-lj.si> | 2015-10-13 13:00:05 +0200 |
commit | a86a6ca92d315dedf3ce4d5035a4c38178f8b531 (patch) | |
tree | 96ae9beb094aa8bfa74d69a0878349107e900b04 /robot/problems/introduction/forward/en.py~ | |
parent | 1e5d42ba53ea0c631dbc6f21887839c91571ebca (diff) |
Remove backup files and add *~ to .gitignore
Diffstat (limited to 'robot/problems/introduction/forward/en.py~')
-rw-r--r-- | robot/problems/introduction/forward/en.py~ | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/robot/problems/introduction/forward/en.py~ b/robot/problems/introduction/forward/en.py~ deleted file mode 100644 index 4337ac5..0000000 --- a/robot/problems/introduction/forward/en.py~ +++ /dev/null @@ -1,20 +0,0 @@ -# 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 = { - -} |