summaryrefslogtreecommitdiff
path: root/impl/systems/generate-long.py
diff options
context:
space:
mode:
Diffstat (limited to 'impl/systems/generate-long.py')
-rw-r--r--impl/systems/generate-long.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/impl/systems/generate-long.py b/impl/systems/generate-long.py
index e98b151..5040adf 100644
--- a/impl/systems/generate-long.py
+++ b/impl/systems/generate-long.py
@@ -1,9 +1,3 @@
-
-<<<<<<< HEAD
print 'x0 = 0'
-for i in xrange(1000000):
-=======
-for i in reversed(xrange(10000)):
->>>>>>> bitbucket/master
+for i in xrange(100000):
print 'x' + str(i+1) + " = x" + str(i)
-print 'x0 = 0'