diff options
author | Zachary Ferguson <zfergus2@users.noreply.github.com> | 2015-10-07 23:46:13 -0400 |
---|---|---|
committer | Zachary Ferguson <zfergus2@users.noreply.github.com> | 2015-10-07 23:46:13 -0400 |
commit | bc212592497b8e6277ba27a1c81a55eee3ad4c23 (patch) | |
tree | 54b9600f90ab7643cf67cc839ee1fb253788d695 /markdown.html.markdown | |
parent | e1ac6209a8d3f43e7a018d79454fb1095b3314c0 (diff) | |
parent | abd7444f9e5343f597b561a69297122142881fc8 (diff) |
Merge remote-tracking branch 'adambard/master'
Conflicts:
java.html.markdown
Diffstat (limited to 'markdown.html.markdown')
-rw-r--r-- | markdown.html.markdown | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/markdown.html.markdown b/markdown.html.markdown index acb808ea..2333110f 100644 --- a/markdown.html.markdown +++ b/markdown.html.markdown @@ -70,7 +70,7 @@ I'm in paragraph three! <!-- Should you ever want to insert an HTML <br /> tag, you can end a paragraph with two or more spaces and then begin a new paragraph. --> -I end with two spaces (highlight me to see them). +I end with two spaces (highlight me to see them). There's a <br /> above me! @@ -97,7 +97,7 @@ or + Item + One more item -or +or - Item - Item @@ -129,7 +129,7 @@ render the numbers in order, but this may not be a good idea --> <!-- There are even task lists. This creates HTML checkboxes. --> Boxes below without the 'x' are unchecked HTML checkboxes. -- [ ] First task to complete. +- [ ] First task to complete. - [ ] Second task that needs done This checkbox below will be a checked HTML checkbox. - [x] This task has been completed @@ -169,7 +169,7 @@ with or without spaces. --> *** --- -- - - +- - - **************** <!-- Links --> |