Merge remote-tracking branch 'update/master'

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
This commit is contained in:
Mathieu PATUREL
2019-11-16 09:18:24 +11:00
46 changed files with 670 additions and 1609 deletions

18
live-testing/images.md Normal file
View File

@ -0,0 +1,18 @@
I'm not sure that it **actually** going to work, but it seems nicer than the [previous version][prev]
this is a test, hello world
This is the first image from the local file system (absolute path, sorry, it's not going
to work on your system unless your username is math2001):
![The sublime text logo!](file:///home/math2001/.config/sublime-text-3/Packages/MarkdownLivePreview/live-testing/sublime_text.png)
This is the first image from the local file system, *relative* path!
![The sublime text logo!](sublime_merge.png)
This is the first image from the internet!
![math2001's logo](https://avatars1.githubusercontent.com/u/15224242?s=400&u=53324cf4e303d15032ba53aa41673a2046b3284b&v=4)
[prev]: https://github.com/math2001/MarkdownLivePreview/tree/d4c477749ce7e77b8e9fc85464a2488f003c45bc

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

18
live-testing/test.md Normal file
View File

@ -0,0 +1,18 @@
# 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!