summaryrefslogtreecommitdiff
path: root/index.mdwn
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-03-01 17:11:40 +0200
committerLars Wirzenius <liw@liw.fi>2017-03-01 17:11:40 +0200
commit8820ca604470ffcc36a2a098f498afcc9e9bf84e (patch)
tree730fc0983f66458f4047a0329ca9415bb68120df /index.mdwn
parentcb1a401e298d71048a598bf336f942d46200579e (diff)
downloadnoir.liw.fi-8820ca604470ffcc36a2a098f498afcc9e9bf84e.tar.gz
Add chapter 3 (conflict)
Diffstat (limited to 'index.mdwn')
-rw-r--r--index.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/index.mdwn b/index.mdwn
index ed20e60..d33cae9 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -19,6 +19,7 @@ There may be contradictions. Retconning in the future is possible.
* [[Negotiation]]
* [[Development setup phase|devsetup]]
+* [[First conflict with SmartHome|conflict]]
* to be continued
# Change log
@@ -36,6 +37,8 @@ For exact details, look at [git][].
* 2017-02-20: Typo fixes from many people.
+* 2017-03-01: Added chapter three ([[conflict]]).
+
[git]: http://git.liw.fi/cgi-bin/cgit/cgit.cgi/noir.liw.fi/
# Legalese