c6ac821c4a
This is a weird merge. I had re-written everything in a separate repository, and basically wanted that new repo (update) to be the new master of this repository, whilst preserving the history of the update repo. Here's what I did: $ git remote add update <path to update> $ git fetch update $ git merge -X theirs --allow-unrelated-histories update/master $ # remove extra files $ git commit --amend
19 lines
296 B
Markdown
19 lines
296 B
Markdown
# hello world
|
|
|
|
This is a *test*. Some inline `[2]code()`.
|
|
|
|
what the hell...
|
|
|
|
```python
|
|
import this
|
|
|
|
if input("answer yes") != 'yes':
|
|
print("Really?")
|
|
```
|
|
|
|
this flickering is really annoying...
|
|
|
|
It looks like it's gone... Oh wait nah, it's still here...
|
|
|
|
This should still be working, and it is!
|