From 8820ca604470ffcc36a2a098f498afcc9e9bf84e Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Wed, 1 Mar 2017 17:11:40 +0200
Subject: Add chapter 3 (conflict)

---
 index.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'index.mdwn')

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
-- 
cgit v1.2.1