From 8ad8200fd7e40095f152b4a3a44da12c8ee817dd Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@digital-scurf.org>
Date: Mon, 10 Sep 2012 20:53:30 +0100
Subject: pregen

---
 docs/modules/Config.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/modules/Config.html')

diff --git a/docs/modules/Config.html b/docs/modules/Config.html
index 213b179..d8ca29f 100644
--- a/docs/modules/Config.html
+++ b/docs/modules/Config.html
@@ -116,6 +116,10 @@
 		<a href="../modules/git2.html">git2</a>
 	</li>
 
+	<li>
+		<a href="../modules/merge.html">merge</a>
+	</li>
+
 </ul>
 
 
-- 
cgit v1.2.1