summaryrefslogtreecommitdiffhomepage
path: root/python.html.markdown
diff options
context:
space:
mode:
authorIan Bertolacci <ian.bertolacci@gmail.com>2015-10-04 22:02:33 -0600
committerIan Bertolacci <ian.bertolacci@gmail.com>2015-10-04 22:02:33 -0600
commita9680e9c02a9490549b6939f7cb16fa88a880538 (patch)
treeaf81bebcd9b564dce72f213fe14a17fe4b9032b2 /python.html.markdown
parent57ea4af17c7ab17e9c32096c2579e0a985e44781 (diff)
parentad4d6f3c1e9dfba3933651116535d590a17092df (diff)
Merge branch 'master' of github.com:adambard/learnxinyminutes-docs
Fixed down merge-conflict.
Diffstat (limited to 'python.html.markdown')
-rw-r--r--python.html.markdown2
1 files changed, 1 insertions, 1 deletions
diff --git a/python.html.markdown b/python.html.markdown
index 352f7349..5572e38e 100644
--- a/python.html.markdown
+++ b/python.html.markdown
@@ -198,7 +198,7 @@ li[::-1] # => [3, 4, 2, 1]
# Remove arbitrary elements from a list with "del"
del li[2] # li is now [1, 2, 3]
-r
+
# You can add lists
li + other_li # => [1, 2, 3, 4, 5, 6]
# Note: values for li and for other_li are not modified.