diff options
author | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-08-07 17:56:43 +1000 |
---|---|---|
committer | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-08-07 17:56:43 +1000 |
commit | 59fb7d23578c4da14f9c14cc413090b1af13328c (patch) | |
tree | 42d187c4b182a025578377f77d1c5e369751b5b3 /impl/systems/generate-long.py | |
parent | c26f38114fedde81effb938ffbedfe922d77a322 (diff) |
Merge complete! Get onto the right branch.
Diffstat (limited to 'impl/systems/generate-long.py')
-rw-r--r-- | impl/systems/generate-long.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/impl/systems/generate-long.py b/impl/systems/generate-long.py index d2462b0..e98b151 100644 --- a/impl/systems/generate-long.py +++ b/impl/systems/generate-long.py @@ -1,4 +1,9 @@ +<<<<<<< HEAD +print 'x0 = 0' +for i in xrange(1000000): +======= for i in reversed(xrange(10000)): +>>>>>>> bitbucket/master print 'x' + str(i+1) + " = x" + str(i) print 'x0 = 0' |