Update markdown and tabs and stuff

This commit is contained in:
2016-10-22 17:07:50 +02:00
parent 67e817490e
commit a27daafa0a
39 changed files with 2249 additions and 2139 deletions

View File

@@ -21,11 +21,12 @@ what I did, and then I branched off the last commit I blogged about
For future reference (I'll probably cheat again someday) there were the commands for this:
git commit -m 'Bad excuse for not checking in before'
git checkout -b new_master OLD_COMMIT_SHA
git merge --strategy=ours master
git checkout master
git merge new_master
:::bash
$ git commit -m 'Bad excuse for not checking in before'
$ git checkout -b new_master OLD_COMMIT_SHA
$ git merge --strategy=ours master
$ git checkout master
$ git merge new_master
The resulting commit is found at
[f74ec287db](https://github.com/thomasloven/os5/tree/f74ec287db488a7bda5